diff options
Diffstat (limited to '')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/gpg/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/ui/CMakeLists.txt | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a6c70923..b7b05796 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -247,7 +247,7 @@ if (APPLICATION_BUILD) set(GPGFRONTEND_BEFORE_UI_LIBS ${GPGFRONTEND_BEFORE_UI_LIBS} smtp) endif () - set(GPGFRONTEND_LIBS ${GPGFRONTEND_AFTER_UI_LIBS} gpgfrontend-ui gpg_core ${GPGFRONTEND_BEFORE_UI_LIBS} easy_logging_pp) + set(GPGFRONTEND_LIBS ${GPGFRONTEND_AFTER_UI_LIBS} gpgfrontend_ui gpgfrontend_core ${GPGFRONTEND_BEFORE_UI_LIBS} easy_logging_pp) set(QT_DEPENDENCY_LIBS Qt5::Network Qt5::PrintSupport Qt5::Widgets Qt5::Test Qt5::Core) message(STATUS "Boost Libraries ${Boost_LIBRARIES}") diff --git a/src/gpg/CMakeLists.txt b/src/gpg/CMakeLists.txt index 0ccc8171..604191f3 100644 --- a/src/gpg/CMakeLists.txt +++ b/src/gpg/CMakeLists.txt @@ -3,7 +3,7 @@ aux_source_directory(./function GPG_SOURCE) aux_source_directory(./model GPG_SOURCE) aux_source_directory(. GPG_SOURCE) -add_library(gpg_core STATIC ${GPG_SOURCE}) +add_library(gpgfrontend_core STATIC ${GPG_SOURCE}) set(UTILS_DIR ${CMAKE_SOURCE_DIR}/utils) @@ -20,21 +20,21 @@ message(STATUS "Third Party Libraries " ${THIRD_PARTY_LIBS}) if (MINGW) message(STATUS "Link GPG Static Library For MINGW") - target_link_libraries(gpg_core ${THIRD_PARTY_LIBS} + target_link_libraries(gpgfrontend_core ${THIRD_PARTY_LIBS} ${BOOST_LIBS} gpgme gpg-error assuan wsock32) - target_compile_features(gpg_core PUBLIC cxx_std_17) + target_compile_features(gpgfrontend_core PUBLIC cxx_std_17) elseif (APPLE) find_library(libgpgme NAMES libgpgme.a) find_library(libgpg-error NAMES libgpg-error.a) find_library(libassuan NAMES libassuan.a) message(STATUS "Link GPG Static Library For macOS") - target_link_libraries(gpg_core ${THIRD_PARTY_LIBS} + target_link_libraries(gpgfrontend_core ${THIRD_PARTY_LIBS} ${BOOST_LIBS} ${libgpgme} ${libgpg-error} ${libassuan} dl) if (XCODE_BUILD) - set_target_properties(gpg_core + set_target_properties(gpgfrontend_core PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE} LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE} @@ -45,7 +45,7 @@ else () find_library(libgpg-error NAMES libgpg-error.a) find_library(libassuan NAMES libassuan.a) message(STATUS "Link GPG Static Library For Unix") - target_link_libraries(gpg_core ${THIRD_PARTY_LIBS} + target_link_libraries(gpgfrontend_core ${THIRD_PARTY_LIBS} ${libgpgme} ${libgpg-error} ${libassuan} ${BOOST_LIBS} pthread dl) diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index 3e44a0d6..ecf83ee3 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -14,18 +14,18 @@ if (SMTP_SUPPORT) aux_source_directory(./smtp UI_SOURCE) endif () -add_library(gpgfrontend-ui STATIC ${UI_SOURCE}) -set(GPGFRONTEND_UI_LIB_NAME gpgfrontend-ui) +add_library(gpgfrontend_ui STATIC ${UI_SOURCE}) +set(GPGFRONTEND_UI_LIB_NAME gpgfrontend_ui) target_link_libraries(${GPGFRONTEND_UI_LIB_NAME} Qt5::Network Qt5::PrintSupport Qt5::Widgets Qt5::Test Qt5::Core) -target_include_directories(gpgfrontend-ui PUBLIC +target_include_directories(gpgfrontend_ui PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/${GPGFRONTEND_UI_LIB_NAME}_autogen/include) if (XCODE_BUILD) - set_target_properties(gpgfrontend-ui + set_target_properties(gpgfrontend_ui PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE} LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE} LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}) endif () -target_compile_features(gpgfrontend-ui PUBLIC cxx_std_17)
\ No newline at end of file +target_compile_features(gpgfrontend_ui PUBLIC cxx_std_17)
\ No newline at end of file |