diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/m_email/CMakeLists.txt | 46 | ||||
| -rw-r--r-- | src/m_gpg_info/CMakeLists.txt | 38 | ||||
| -rw-r--r-- | src/m_key_server_sync/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | src/m_paper_key/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | src/m_pinentry/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | src/m_ver_check/CMakeLists.txt | 40 |
7 files changed, 67 insertions, 119 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 38e16ef..c0a67ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ set(CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_SOURCE_DIR}/cmake/FlagsOverrides.cma # define project project(GpgFrontendModules - VERSION 2.1.8 + VERSION ${CMAKE_PROJECT_VERSION} DESCRIPTION "Modules of GpgFrontend" HOMEPAGE_URL "https://gpgfrontend.bktus.com" LANGUAGES CXX) diff --git a/src/m_email/CMakeLists.txt b/src/m_email/CMakeLists.txt index 1efd28a..9636cc1 100644 --- a/src/m_email/CMakeLists.txt +++ b/src/m_email/CMakeLists.txt @@ -28,8 +28,8 @@ set(INTEGRATED_MODULE_SOURCE "") aux_source_directory(. INTEGRATED_MODULE_SOURCE) -# define libgpgfrontend_module -add_library(mod_email SHARED ${INTEGRATED_MODULE_SOURCE}) +# register module +register_module(mod_email MODULE_TARGET ${INTEGRATED_MODULE_SOURCE}) set(VMIME_INSTALL OFF CACHE BOOL "Don't Install") set(VMIME_BUILD_TESTS OFF CACHE BOOL "No Unit Test") @@ -50,27 +50,18 @@ if(MINGW) endif() # vmime headers -target_include_directories(mod_email PRIVATE +target_include_directories(${MODULE_TARGET} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/vmime/src" "${CMAKE_BINARY_DIR}/src/vmime" "${CMAKE_BINARY_DIR}/src") -# /Users/erich/Documents/Entwicklung/GpgFrontend/modules/build/src/vmime/config.hpp -# /Users/erich/Documents/Entwicklung/GpgFrontend/modules/build message(STATUS "CMAKE_BINARY_DIR of module email: ${CMAKE_BINARY_DIR}") -# link sdk -target_link_libraries(mod_email PRIVATE - gpgfrontend_module_sdk) - # link qt -target_link_libraries(mod_email PRIVATE Qt::Core Qt::Widgets Qt::Concurrent) +target_link_libraries(${MODULE_TARGET} PRIVATE Qt::Core Qt::Widgets Qt::Concurrent) # link vmime -target_link_libraries(mod_email PRIVATE vmime-static) - -# using std c++ 17 -target_compile_features(mod_email PRIVATE cxx_std_17) +target_link_libraries(${MODULE_TARGET} PRIVATE vmime-static) # i18n set(LOCALE_TS_PATH ${CMAKE_CURRENT_SOURCE_DIR}/ts) @@ -80,15 +71,20 @@ set(TS_FILES "${LOCALE_TS_PATH}/ModuleEMail.en_US.ts" "${LOCALE_TS_PATH}/ModuleEMail.it_iT.ts" "${LOCALE_TS_PATH}/ModuleEMail.zh_CN.ts" "${LOCALE_TS_PATH}/ModuleEMail.zh_TW.ts") -qt_add_translations(mod_email - RESOURCE_PREFIX "/i18n" - TS_FILES ${TS_FILES} - SOURCES ${INTEGRATED_MODULE_SOURCE} - INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}) -# install paths -install(TARGETS mod_email - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -)
\ No newline at end of file +if(NOT XCODE_BUILD) + qt_add_translations(${MODULE_TARGET} + RESOURCE_PREFIX "/i18n" + TS_FILES ${TS_FILES} + SOURCES ${INTEGRATED_MODULE_SOURCE} + INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}) +else() + add_custom_target("${MODULE_TARGET}_i18n" ALL) + qt_add_lrelease("${MODULE_TARGET}_i18n" + TS_FILES ${TS_FILES} + QM_FILES_OUTPUT_VARIABLE TRANSLATIONS_QM) + qt_add_resources(${MODULE_TARGET} "${MODULE_TARGET}_i18n" + PREFIX "/i18n" + BASE ${CMAKE_CURRENT_BINARY_DIR} + FILES ${TRANSLATIONS_QM}) +endif()
\ No newline at end of file diff --git a/src/m_gpg_info/CMakeLists.txt b/src/m_gpg_info/CMakeLists.txt index 660c1c3..16b8982 100644 --- a/src/m_gpg_info/CMakeLists.txt +++ b/src/m_gpg_info/CMakeLists.txt @@ -29,17 +29,10 @@ set(INTEGRATED_MODULE_SOURCE "") aux_source_directory(. INTEGRATED_MODULE_SOURCE) # define libgpgfrontend_module -add_library(mod_gpg_info SHARED ${INTEGRATED_MODULE_SOURCE}) - -# link sdk -target_link_libraries(mod_gpg_info PRIVATE - gpgfrontend_module_sdk) +register_module(gpg_info MODULE_TARGET ${INTEGRATED_MODULE_SOURCE}) # link qt -target_link_libraries(mod_gpg_info PRIVATE Qt::Core Qt::Widgets Qt::Concurrent) - -# using std c++ 17 -target_compile_features(mod_gpg_info PRIVATE cxx_std_17) +target_link_libraries(${MODULE_TARGET} PRIVATE Qt::Core Qt::Widgets Qt::Concurrent) # i18n set(LOCALE_TS_PATH ${CMAKE_CURRENT_SOURCE_DIR}/ts) @@ -49,15 +42,20 @@ set(TS_FILES "${LOCALE_TS_PATH}/ModuleGnuPGInfoGathering.en_US.ts" "${LOCALE_TS_PATH}/ModuleGnuPGInfoGathering.it_iT.ts" "${LOCALE_TS_PATH}/ModuleGnuPGInfoGathering.zh_CN.ts" "${LOCALE_TS_PATH}/ModuleGnuPGInfoGathering.zh_TW.ts") -qt_add_translations(mod_gpg_info - RESOURCE_PREFIX "/i18n" - TS_FILES ${TS_FILES} - SOURCES ${INTEGRATED_MODULE_SOURCE} - INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}) -# install paths -install(TARGETS mod_gpg_info - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -)
\ No newline at end of file +if(NOT XCODE_BUILD) + qt_add_translations(${MODULE_TARGET} + RESOURCE_PREFIX "/i18n" + TS_FILES ${TS_FILES} + SOURCES ${INTEGRATED_MODULE_SOURCE} + INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}) +else() + add_custom_target("${MODULE_TARGET}_i18n" ALL) + qt_add_lrelease("${MODULE_TARGET}_i18n" + TS_FILES ${TS_FILES} + QM_FILES_OUTPUT_VARIABLE TRANSLATIONS_QM) + qt_add_resources(${MODULE_TARGET} "${MODULE_TARGET}_i18n" + PREFIX " /i18n " + BASE ${CMAKE_CURRENT_BINARY_DIR} + FILES ${TRANSLATIONS_QM}) +endif()
\ No newline at end of file diff --git a/src/m_key_server_sync/CMakeLists.txt b/src/m_key_server_sync/CMakeLists.txt index 13e719d..bd28f7f 100644 --- a/src/m_key_server_sync/CMakeLists.txt +++ b/src/m_key_server_sync/CMakeLists.txt @@ -29,21 +29,7 @@ set(INTEGRATED_MODULE_SOURCE "") aux_source_directory(. INTEGRATED_MODULE_SOURCE) # define libgpgfrontend_module -add_library(mod_key_server_sync SHARED ${INTEGRATED_MODULE_SOURCE}) - -# link sdk -target_link_libraries(mod_key_server_sync PRIVATE - gpgfrontend_module_sdk) +register_module(key_server_sync MODULE_TARGET ${INTEGRATED_MODULE_SOURCE}) # link qt -target_link_libraries(mod_key_server_sync PRIVATE Qt::Core Qt::Network) - -# using std c++ 17 -target_compile_features(mod_key_server_sync PRIVATE cxx_std_17) - -# install paths -install(TARGETS mod_key_server_sync - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -)
\ No newline at end of file +target_link_libraries(${MODULE_TARGET} PRIVATE Qt::Core Qt::Network)
\ No newline at end of file diff --git a/src/m_paper_key/CMakeLists.txt b/src/m_paper_key/CMakeLists.txt index f388a40..8ab813a 100644 --- a/src/m_paper_key/CMakeLists.txt +++ b/src/m_paper_key/CMakeLists.txt @@ -28,22 +28,8 @@ set(INTEGRATED_MODULE_SOURCE "") aux_source_directory(. INTEGRATED_MODULE_SOURCE) -# define libgpgfrontend_module -add_library(mod_paper_key SHARED ${INTEGRATED_MODULE_SOURCE}) - -# link sdk -target_link_libraries(mod_paper_key PRIVATE - gpgfrontend_module_sdk) +# register module +register_module(paper_key MODULE_TARGET ${INTEGRATED_MODULE_SOURCE}) # link qt -target_link_libraries(mod_paper_key PRIVATE Qt::Core) - -# using std c++ 17 -target_compile_features(mod_paper_key PRIVATE cxx_std_17) - -# install paths -install(TARGETS mod_paper_key - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -)
\ No newline at end of file +target_link_libraries(${MODULE_TARGET} PRIVATE Qt::Core)
\ No newline at end of file diff --git a/src/m_pinentry/CMakeLists.txt b/src/m_pinentry/CMakeLists.txt index 7ab0e5d..3c13f4e 100644 --- a/src/m_pinentry/CMakeLists.txt +++ b/src/m_pinentry/CMakeLists.txt @@ -37,24 +37,8 @@ endif() list(APPEND INTEGRATED_MODULE_SOURCE "pinentry.qrc") -# define module -add_library(mod_pinentry SHARED ${INTEGRATED_MODULE_SOURCE}) - -# link options - -# link sdk -target_link_libraries(mod_pinentry PRIVATE - gpgfrontend_module_sdk) +# register module +register_module(pinentry MODULE_TARGET ${INTEGRATED_MODULE_SOURCE}) # link qt -target_link_libraries(mod_pinentry PUBLIC Qt::Widgets) - -# using std c++ 17 -target_compile_features(mod_pinentry PUBLIC cxx_std_17) - -# install paths -install(TARGETS mod_pinentry - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -) +target_link_libraries(${MODULE_TARGET} PUBLIC Qt::Widgets) diff --git a/src/m_ver_check/CMakeLists.txt b/src/m_ver_check/CMakeLists.txt index d064ac4..e6cb54e 100644 --- a/src/m_ver_check/CMakeLists.txt +++ b/src/m_ver_check/CMakeLists.txt @@ -28,18 +28,11 @@ set(INTEGRATED_MODULE_SOURCE "") aux_source_directory(. INTEGRATED_MODULE_SOURCE) -# define libgpgfrontend_module -add_library(mod_ver_check SHARED ${INTEGRATED_MODULE_SOURCE}) - -# link sdk -target_link_libraries(mod_ver_check PRIVATE - gpgfrontend_module_sdk) +# register module +register_module(ver_check MODULE_TARGET ${INTEGRATED_MODULE_SOURCE}) # link qt -target_link_libraries(mod_ver_check PUBLIC Qt::Core Qt::Network Qt::Widgets) - -# using std c++ 17 -target_compile_features(mod_ver_check PRIVATE cxx_std_17) +target_link_libraries(${MODULE_TARGET} PUBLIC Qt::Core Qt::Network Qt::Widgets) # ui set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_AUTOUIC_SEARCH_PATHS} ${CMAKE_CURRENT_SOURCE_DIR}/ui) @@ -53,15 +46,20 @@ set(TS_FILES "${LOCALE_TS_PATH}/ModuleVersionChecking.it_IT.ts" "${LOCALE_TS_PATH}/ModuleVersionChecking.zh_CN.ts" "${LOCALE_TS_PATH}/ModuleVersionChecking.zh_TW.ts") -qt_add_translations(mod_ver_check - RESOURCE_PREFIX "/i18n" - TS_FILES ${TS_FILES} - SOURCES ${INTEGRATED_MODULE_SOURCE} - INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}) -# install paths -install(TARGETS mod_ver_check - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -)
\ No newline at end of file +if(NOT XCODE_BUILD) + qt_add_translations(${MODULE_TARGET} + RESOURCE_PREFIX "/i18n" + TS_FILES ${TS_FILES} + SOURCES ${INTEGRATED_MODULE_SOURCE} + INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}) +else() + add_custom_target("${MODULE_TARGET}_i18n" ALL) + qt_add_lrelease("${MODULE_TARGET}_i18n" + TS_FILES ${TS_FILES} + QM_FILES_OUTPUT_VARIABLE TRANSLATIONS_QM) + qt_add_resources(${MODULE_TARGET} "${MODULE_TARGET}_i18n" + PREFIX " /i18n " + BASE ${CMAKE_CURRENT_BINARY_DIR} + FILES ${TRANSLATIONS_QM}) +endif()
\ No newline at end of file |