diff options
| author | Saturneric <[email protected]> | 2022-01-13 01:42:30 +0000 |
|---|---|---|
| committer | Saturneric <[email protected]> | 2022-01-13 02:38:04 +0000 |
| commit | d307f5e025b98088ff4655fafb9142a4d12e52be (patch) | |
| tree | 8544a42b4afc543efa2f5a22543aeb9a9103a32f | |
| parent | <chore>(project, resource, ci): fix ci of debug.yml (diff) | |
| download | GpgFrontend-d307f5e025b98088ff4655fafb9142a4d12e52be.tar.gz GpgFrontend-d307f5e025b98088ff4655fafb9142a4d12e52be.zip | |
<chore>(project, resource, ci): fix ci of debug.yml
1. Adjust the ci configuration file for macOS and Windows.
2. Fixed the problem of OpenSSL under macOS.
Diffstat (limited to '')
| -rw-r--r-- | .github/workflows/debug.yml | 6 | ||||
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/ui/CMakeLists.txt | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index 73c8b963..496e42a7 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -91,7 +91,7 @@ jobs: pacman --noconfirm -S --needed mingw-w64-x86_64-gcc mingw-w64-x86_64-make mingw-w64-x86_64-cmake autoconf pacman --noconfirm -S --needed make texinfo mingw-w64-x86_64-libconfig mingw-w64-x86_64-boost automake pacman --noconfirm -S --needed mingw-w64-x86_64-qt5 libintl msys2-runtime-devel gettext-devel - pacman --noconfirm -S --needed mingw-w64-x86_64-gpgme mingw-w64-x86_64-ninja mingw-w64-x86_64-gnupg + pacman --noconfirm -S --needed mingw-w64-x86_64-gpgme mingw-w64-x86_64-gnupg if: matrix.os == 'windows-latest' - name: Build GpgME (Windows) @@ -114,7 +114,7 @@ jobs: - name: Build GpgFrontend (macOS) # Build your GpgFrontend with the given configuration run: | - cmake -B ${{github.workspace}}/build -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_TYPE_TEST_UI=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl + cmake -B ${{github.workspace}}/build -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_TYPE_TEST_UI=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/[email protected] cmake --build ${{github.workspace}}/build --config {{$env.BUILD_TYPE}} -- -v if: matrix.os == 'macos-10.15' @@ -123,7 +123,7 @@ jobs: run: | cd $(echo "/${{github.workspace}}" | sed 's/\\/\//g' | sed 's/://') mkdir build && cd build - cmake -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_TYPE_TEST_UI=ON .. + cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_TYPE_TEST_UI=ON .. # Build your program with the given configuration cmake --build . --config ${{env.BUILD_TYPE}} -- -v if: matrix.os == 'windows-latest' diff --git a/CMakeLists.txt b/CMakeLists.txt index 977c19d7..06765a61 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -302,7 +302,6 @@ if (GPG_STANDALONE_MODE) endif () - if (LINUX_INSTALL_SOFTWARE) message(STATUS "Configure Linux Install ON") include(GNUInstallDirs) @@ -363,6 +362,9 @@ endif () # Introduce boost find_package(Boost COMPONENTS date_time filesystem REQUIRED) +# Introduce OpenSSL +find_package(OpenSSL REQUIRED) + if (QT5_ENV_SUPPORT) # Support Qt version Both 5.12.x and 5.15.x if (USE_QT_DEFAULT_ENV) diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index f51d02e5..2b18e971 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -43,6 +43,9 @@ target_link_libraries(${GPGFRONTEND_UI_LIB_NAME} target_link_libraries(${GPGFRONTEND_UI_LIB_NAME} gpgfrontend_core) +# link openssl +target_link_libraries(${GPGFRONTEND_UI_LIB_NAME} OpenSSL::SSL OpenSSL::Crypto) + target_include_directories(gpgfrontend_ui PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/${GPGFRONTEND_UI_LIB_NAME}_autogen/include) |