GpgFrontend/GpgFrontend
1
0
Fork 0
Code Issues Pull Requests Actions Releases Activity

fix: solve ci issues

Browse Source
This commit is contained in:
saturneric 2024-07-29 19:13:39 +02:00
parent 8f1edf278a
commit e6b265c95c
5 changed files with 16 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/release-qt5.yml vendored
View File

@ -53,6 +53,7 @@ jobs:
pacman --noconfirm -S --needed make texinfo automake
pacman --noconfirm -S --needed mingw-w64-x86_64-qt5 mingw-w64-x86_64-angleproject libintl msys2-runtime-devel gettext-devel
pacman --noconfirm -S --needed mingw-w64-x86_64-ninja mingw-w64-x86_64-gnupg mingw-w64-x86_64-libarchive
pacman --noconfirm -S --needed mingw-w64-x86_64-gtest
if: matrix.os == 'windows-2019'
- name: Install Dependence (Linux)
@ -152,16 +153,15 @@ jobs:
cd $(echo "/${{github.workspace}}" | sed 's/\\/\//g' | sed 's/://')
cd third_party/mimalloc
mkdir build && cd build
cmake -G Ninja -DMI_SECURE=ON ..
ninja
sudo ninja install
cmake -G Ninja -DMI_SECURE=ON -DCMAKE_INSTALL_PREFIX=$MSYSTEM_PREFIX .. && ninja
ninja install
if: matrix.os == 'windows-2019'
- name: Build googletest (Linux)
run: |
cd ${{github.workspace}}/third_party/googletest
mkdir build && cd build
cmake -G Ninja ..
cmake -G Ninja -DBUILD_SHARED_LIBS=ON ..
ninja
sudo ninja install
if: matrix.os == 'ubuntu-20.04'

7
.github/workflows/release.yml vendored
View File

@ -180,16 +180,15 @@ jobs:
cd $(echo "/${{github.workspace}}" | sed 's/\\/\//g' | sed 's/://')
cd third_party/mimalloc
mkdir build && cd build
cmake -G Ninja -DMI_SECURE=ON ..
ninja
sudo ninja install
cmake -G Ninja -DMI_SECURE=ON -DCMAKE_INSTALL_PREFIX=$MSYSTEM_PREFIX .. && ninja
ninja install
if: matrix.os == 'windows-2019'
- name: Build googletest (Linux)
run: |
cd ${{github.workspace}}/third_party/googletest
mkdir build && cd build
cmake -G Ninja ..
cmake -G Ninja -DBUILD_SHARED_LIBS=ON ..
ninja
sudo ninja install
if: matrix.os == 'ubuntu-20.04'

2
modules

@ -1 +1 @@
Subproject commit 328bf940a1bc2a166d60e558833df6b7bd07669f
Subproject commit efe066a18f1e6ec36c7a1ebcac80e11a7c1e46da

36
src/core/CMakeLists.txt
View File

@ -53,15 +53,6 @@ target_compile_definitions(gpgfrontend_core PUBLIC GF_CORE)
# mimalloc (except apple macos)
if(NOT APPLE)
target_link_libraries(gpgfrontend_core PUBLIC mimalloc)
# use system installed libraries or install it system wide
if(MINGW AND NOT STABLE_BUILD_FULL_SDK)
set_target_properties(mimalloc
PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
)
endif()
endif()
# qt-aes
@ -84,28 +75,17 @@ if(MINGW)
endif()
# configure libarchive
if(NOT MINGW)
if(APPLE)
if(EXISTS "/usr/local/opt/libarchive/include")
set(LibArchive_INCLUDE_DIR "/usr/local/opt/libarchive/include")
else()
set(LibArchive_INCLUDE_DIR "/opt/homebrew/opt/libarchive/include")
endif()
endif()
find_package(LibArchive REQUIRED)
target_include_directories(gpgfrontend_core PRIVATE ${LibArchive_INCLUDE_DIR})
else()
# use system installed libraries or install it system wide
if(NOT STABLE_BUILD_FULL_SDK)
set_target_properties(archive
PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
)
if(APPLE)
if(EXISTS "/usr/local/opt/libarchive/include")
set(LibArchive_INCLUDE_DIR "/usr/local/opt/libarchive/include")
else()
set(LibArchive_INCLUDE_DIR "/opt/homebrew/opt/libarchive/include")
endif()
endif()
find_package(LibArchive REQUIRED)
target_include_directories(gpgfrontend_core PRIVATE ${LibArchive_INCLUDE_DIR})
# link libarchive
target_link_libraries(gpgfrontend_core PRIVATE archive)

9
src/test/CMakeLists.txt
View File

@ -53,15 +53,6 @@ if(XCODE_BUILD)
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "${GPGFRONTEND_XOCDE_CODE_SIGN_IDENTITY}")
endif()
# use system installed libraries or install it system wide
if(MINGW AND NOT STABLE_BUILD_FULL_SDK)
set_target_properties(gtest
PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
)
endif()
if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
# lib output path
set_target_properties(gpgfrontend_test PROPERTIES