diff options
| author | saturneric <[email protected]> | 2024-07-30 16:00:50 +0000 |
|---|---|---|
| committer | saturneric <[email protected]> | 2024-07-30 16:00:50 +0000 |
| commit | 7041fe65e341acc7c067f807842ac3ae605be33c (patch) | |
| tree | 6f67247d538c514ccff0cc53a69753ad6c538be4 | |
| parent | fix: remove googletest, libarchive and mimalloc source code from repo (diff) | |
| download | GpgFrontend-7041fe65e341acc7c067f807842ac3ae605be33c.tar.gz GpgFrontend-7041fe65e341acc7c067f807842ac3ae605be33c.zip | |
fix: do some build config clean up
| -rw-r--r-- | src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/core/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | src/ui/CMakeLists.txt | 12 |
3 files changed, 6 insertions, 25 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 131d11b2..eb7766a1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -418,11 +418,7 @@ if(STABLE_BUILD_ONLY_APPLICATION) target_include_directories(${AppName} PUBLIC "${CMAKE_INSTALL_PREFIX}/include/gpgfrontend") # link qt - if(GPGFRONTEND_QT5_BUILD) - target_link_libraries(${AppName} Qt5::Core Qt5::Widgets) - else() - target_link_libraries(${AppName} Qt6::Core Qt6::Widgets) - endif() + target_link_libraries(${AppName} Qt::Core Qt::Widgets) endif() # link options for GpgFrontend diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index b869d8e1..921e8944 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -59,10 +59,6 @@ endif() target_sources(gpgfrontend_core PRIVATE ${CMAKE_SOURCE_DIR}/third_party/qt-aes/qaesencryption.cpp) -# encoding detect library -aux_source_directory(${CMAKE_SOURCE_DIR}/third_party/encoding-detect ENCODING_DETECT_SOURCE_CODE) -target_sources(gpgfrontend_core PUBLIC ${ENCODING_DETECT_SOURCE_CODE}) - # link gnupg libraries target_link_libraries(gpgfrontend_core PUBLIC gpgme assuan gpg-error) @@ -89,13 +85,8 @@ target_include_directories(gpgfrontend_core PRIVATE ${LibArchive_INCLUDE_DIR}) # link libarchive target_link_libraries(gpgfrontend_core PRIVATE archive) -if(GPGFRONTEND_QT5_BUILD) - # link Qt core - target_link_libraries(gpgfrontend_core PUBLIC Qt5::Core) -else() - # link Qt core - target_link_libraries(gpgfrontend_core PUBLIC Qt6::Core) -endif() +# link qt +target_link_libraries(gpgfrontend_core PUBLIC Qt::Core) # set up pch target_precompile_headers(gpgfrontend_core diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index 22abeb5f..b3cd0165 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -52,15 +52,9 @@ generate_export_header(gpgfrontend_ui EXPORT_FILE_NAME "${_export_file}") # compile definitions target_compile_definitions(gpgfrontend_ui PUBLIC GF_UI) -if(GPGFRONTEND_QT5_BUILD) - # link Qt - target_link_libraries(gpgfrontend_ui - Qt5::Core Qt5::Widgets Qt5::Network Qt5::PrintSupport) -else() - # link Qt - target_link_libraries(gpgfrontend_ui - Qt6::Core Qt6::Widgets Qt6::Network Qt6::PrintSupport) -endif() +# link qt +target_link_libraries(gpgfrontend_ui + Qt::Core Qt::Widgets Qt::Network Qt::PrintSupport) # link gpgfrontend_core target_link_libraries(gpgfrontend_ui gpgfrontend_core) |