diff options
| author | saturneric <[email protected]> | 2024-01-26 06:28:21 +0000 |
|---|---|---|
| committer | saturneric <[email protected]> | 2024-01-26 06:28:28 +0000 |
| commit | b58012dc6bba09d086db8743bed66ac35be2a92b (patch) | |
| tree | 9de051d20f73e4f06c1b3e7a6724c1227a247a41 | |
| parent | doc: fill translations mainly de and chinese (diff) | |
| download | GpgFrontend-b58012dc6bba09d086db8743bed66ac35be2a92b.tar.gz GpgFrontend-b58012dc6bba09d086db8743bed66ac35be2a92b.zip | |
fix: cannot correctly compile
| -rw-r--r-- | resource/lfs/locale/ts/GpgFrontend.fr_FR.ts | 2 | ||||
| -rw-r--r-- | src/core/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | third_party/CMakeLists.txt | 6 |
3 files changed, 19 insertions, 3 deletions
diff --git a/resource/lfs/locale/ts/GpgFrontend.fr_FR.ts b/resource/lfs/locale/ts/GpgFrontend.fr_FR.ts index d739bec3..e1b454d2 100644 --- a/resource/lfs/locale/ts/GpgFrontend.fr_FR.ts +++ b/resource/lfs/locale/ts/GpgFrontend.fr_FR.ts @@ -676,7 +676,7 @@ <message> <location filename="../../../../src/ui/UserInterfaceUtils.cpp" line="185"/> <source>Gnupg(gpg) is not installed correctly, please follow <a href='https://www.gpgfrontend.bktus.com/#/faq?id=how-to-deal-with-39env-loading-failed39'>this notes</a> in FAQ to install Gnupg and then open GpgFrontend. <br />Or, you can open GnuPG Controller to set a custom GnuPG which GpgFrontend should use. Then, GpgFrontend will restart. <br /><br />Breif Reason: %1</source> - <translation type="unfinished">Gnupg(gpg) n'est pas installé correctement, veuillez suivre <a href='https://www.gpgfrontend.bktus.com/#/faq?id=how-to-deal-with-39env-loading-failed39'>this notes</a> dans la FAQ pour installer Gnupg et ensuite ouvrir GpgFrontend. <br />Ou, vous pouvez ouvrir GnuPG Controller pour définir un GnuPG personnalisé que GpgFrontend devrait utiliser. Ensuite, GpgFrontend redémarrera. <br /><br />Raison de la rupture : %1</source></translation> + <translation type="unfinished">Gnupg(gpg) n'est pas installé correctement, veuillez suivre <a href='https://www.gpgfrontend.bktus.com/#/faq?id=how-to-deal-with-39env-loading-failed39'>this notes</a> dans la FAQ pour installer Gnupg et ensuite ouvrir GpgFrontend. <br />Ou, vous pouvez ouvrir GnuPG Controller pour définir un GnuPG personnalisé que GpgFrontend devrait utiliser. Ensuite, GpgFrontend redémarrera. <br /><br />Raison de la rupture : %1</translation> </message> <message> <source>No keys found to import</source> diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 54c3bf41..d3f46ed2 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -75,6 +75,20 @@ endif () # spdlog target_link_libraries(gpgfrontend_core PRIVATE spdlog) + +# 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}) +endif() + # link libarchive target_link_libraries(gpgfrontend_core PRIVATE archive) diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index df8bca3a..534d71da 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -29,10 +29,12 @@ set(JSON_BuildTests OFF CACHE INTERNAL "") add_subdirectory(spdlog EXCLUDE_FROM_ALL) -add_subdirectory(libarchive EXCLUDE_FROM_ALL) +if (MINGW) + add_subdirectory(libarchive EXCLUDE_FROM_ALL) +endif() # not working at macOS -if(NOT APPLE) +if (NOT APPLE) set(MI_SECURE ON) if(${CMAKE_BUILD_TYPE} STREQUAL "Debug") # set(MI_TRACK_VALGRIND ON) |