diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 37 | ||||
| -rw-r--r-- | src/gpg/CMakeLists.txt | 29 | ||||
| -rw-r--r-- | src/ui/CMakeLists.txt | 17 |
3 files changed, 29 insertions, 54 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 15c3c532..c3be9ebe 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -254,43 +254,16 @@ if (APPLICATION_BUILD) endif () if (APPLICATION_BUILD) - - if (ADVANCE_SUPPORT) - set(GPGFRONTEND_BEFORE_UI_LIBS ${GPGFRONTEND_BEFORE_UI_LIBS} advance) - endif () - if (ADVANCE_SUPPORT) - set(GPGFRONTEND_BEFORE_UI_LIBS ${GPGFRONTEND_BEFORE_UI_LIBS} server) - endif () - - set(GPGFRONTEND_LIBS ${GPGFRONTEND_AFTER_UI_LIBS} gpgfrontend_ui gpgfrontend_core ${GPGFRONTEND_BEFORE_UI_LIBS} easyloggingpp) - set(QT_DEPENDENCY_LIBS Qt5::Network Qt5::PrintSupport Qt5::Widgets Qt5::Test Qt5::Core) - + target_link_libraries(${AppName} gpgfrontend_ui) IF (MINGW) message(STATUS "Link Application Static Library For MINGW") - - target_link_libraries(${AppName} - ${GPGFRONTEND_LIBS} - ${QT_DEPENDENCY_LIBS} - ${Boost_LIBRARIES} - crypto ssl) + target_link_libraries(${AppName} crypto) elseif (APPLE) message(STATUS "Link Application Static Library For macOS") - target_link_libraries(${AppName} - ${GPGFRONTEND_LIBS} - ${QT_DEPENDENCY_LIBS} - ${Boost_LIBRARIES} - crypto ssl intl) + target_link_libraries(${AppName} crypto intl) else () - message(STATUS "Link Application Static Library For UNIX ") - if (APP_IMAGE_UPDATE) - target_link_libraries(${AppName} - libappimageupdate) - endif () - target_link_libraries(${AppName} - ${GPGFRONTEND_LIBS} - ${QT_DEPENDENCY_LIBS} - ${Boost_LIBRARIES} - crypto ssl pthread) + message(STATUS "Link Application Static Library For Linux") + target_link_libraries(${AppName} crypto pthread) endif () endif () diff --git a/src/gpg/CMakeLists.txt b/src/gpg/CMakeLists.txt index 10d3dc5b..ac8896fb 100644 --- a/src/gpg/CMakeLists.txt +++ b/src/gpg/CMakeLists.txt @@ -32,24 +32,27 @@ aux_source_directory(. GPG_SOURCE) add_library(gpgfrontend_core STATIC ${GPG_SOURCE}) set(UTILS_DIR ${CMAKE_SOURCE_DIR}/utils) - set(GPGME_LIB_DIR ${UTILS_DIR}/gpgme/lib) -set(THIRD_PARTY_LIBS easyloggingpp config++) -set(BOOST_LIBS Boost::date_time Boost::filesystem) +# link third-party libraries +target_link_libraries(gpgfrontend_core easyloggingpp config++ archive_static) +# link boost libraries +target_link_libraries(gpgfrontend_core Boost::date_time Boost::filesystem) +# link gnupg libraries +target_link_libraries(gpgfrontend_core gpgme assuan gpg-error) +# link openssl +target_link_libraries(gpgfrontend_core OpenSSL::SSL OpenSSL::Crypto) + +# set up pch +target_precompile_headers(gpgfrontend_core PUBLIC ${CMAKE_SOURCE_DIR}/src/GpgFrontend.h) if (MINGW) message(STATUS "Link GPG Static Library For MINGW") - target_link_libraries(gpgfrontend_core ${THIRD_PARTY_LIBS} - ${BOOST_LIBS} - gpgme assuan gpg-error wsock32) + target_link_libraries(gpgfrontend_core wsock32) target_compile_features(gpgfrontend_core PUBLIC cxx_std_17) elseif (APPLE) message(STATUS "Link GPG Static Library For macOS") - target_link_libraries(gpgfrontend_core ${THIRD_PARTY_LIBS} - gpgme assuan gpg-error - ${BOOST_LIBS} - dl) + target_link_libraries(gpgfrontend_core dl) if (XCODE_BUILD) set_target_properties(gpgfrontend_core PROPERTIES @@ -58,9 +61,7 @@ elseif (APPLE) LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}) endif () else () + # linux message(STATUS "Link GPG Static Library For Unix") - target_link_libraries(gpgfrontend_core ${THIRD_PARTY_LIBS} - gpgme assuan gpg-error - ${BOOST_LIBS} - pthread dl) + target_link_libraries(gpgfrontend_core pthread dl) endif () diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index 6d578390..87a739b4 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -36,13 +36,13 @@ aux_source_directory(thread UI_SOURCE) aux_source_directory(details UI_SOURCE) aux_source_directory(struct UI_SOURCE) aux_source_directory(import_export UI_SOURCE) -aux_source_directory(encoding UI_SOURCE) aux_source_directory(dialog UI_SOURCE) if (SMTP_SUPPORT) aux_source_directory(mail UI_SOURCE) endif () +# libgpgfrontend_ui add_library(gpgfrontend_ui STATIC ${UI_SOURCE}) set(GPGFRONTEND_UI_LIB_NAME gpgfrontend_ui) @@ -51,6 +51,7 @@ if (SMTP_SUPPORT) target_link_libraries(${GPGFRONTEND_UI_LIB_NAME} smtp-mime) endif () + # link json target_link_libraries(${GPGFRONTEND_UI_LIB_NAME} nlohmann_json::nlohmann_json) @@ -73,21 +74,21 @@ else () gpgfrontend_vmime anl ssl crypto) endif () -# link easyloggingpp -target_link_libraries(${GPGFRONTEND_UI_LIB_NAME} - easyloggingpp) - # link gpgfrontend_core target_link_libraries(${GPGFRONTEND_UI_LIB_NAME} gpgfrontend_core) -# link openssl -target_link_libraries(${GPGFRONTEND_UI_LIB_NAME} OpenSSL::SSL OpenSSL::Crypto) +# link encoding_detect +target_link_libraries(${GPGFRONTEND_UI_LIB_NAME} encoding_detect) +# set up pch +target_precompile_headers(${GPGFRONTEND_UI_LIB_NAME} PUBLIC GpgFrontendUI.h) + +# add ui generator include path target_include_directories(gpgfrontend_ui PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/${GPGFRONTEND_UI_LIB_NAME}_autogen/include) - +# for xcode archive build if (XCODE_BUILD) set_target_properties(${GPGFRONTEND_UI_LIB_NAME} PROPERTIES |