aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorsaturneric <[email protected]>2025-04-30 21:54:42 +0000
committersaturneric <[email protected]>2025-04-30 21:54:42 +0000
commit0a04125026893bcfadc65d4cbdfae70784db3015 (patch)
treea85ded684149e8149370be1c15594f804adf33e4 /src
parentchore: upgrade to v2.1.8 (diff)
downloadModules-0a04125026893bcfadc65d4cbdfae70784db3015.tar.gz
Modules-0a04125026893bcfadc65d4cbdfae70784db3015.zip
refactor: switch to in project submodule build model
Diffstat (limited to 'src')
-rw-r--r--src/m_email/CMakeLists.txt13
-rw-r--r--src/m_gpg_info/CMakeLists.txt13
-rw-r--r--src/m_key_server_sync/CMakeLists.txt11
-rw-r--r--src/m_paper_key/CMakeLists.txt11
-rw-r--r--src/m_pinentry/CMakeLists.txt11
-rw-r--r--src/m_ver_check/CMakeLists.txt13
6 files changed, 45 insertions, 27 deletions
diff --git a/src/m_email/CMakeLists.txt b/src/m_email/CMakeLists.txt
index 4b1a8db..1efd28a 100644
--- a/src/m_email/CMakeLists.txt
+++ b/src/m_email/CMakeLists.txt
@@ -49,10 +49,6 @@ if(MINGW)
target_link_libraries(vmime-static ws2_32 mlang)
endif()
-# install dir
-install(TARGETS mod_email
- LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/modules")
-
# vmime headers
target_include_directories(mod_email PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/vmime/src"
@@ -88,4 +84,11 @@ qt_add_translations(mod_email
RESOURCE_PREFIX "/i18n"
TS_FILES ${TS_FILES}
SOURCES ${INTEGRATED_MODULE_SOURCE}
- INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}) \ No newline at end of file
+ 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
diff --git a/src/m_gpg_info/CMakeLists.txt b/src/m_gpg_info/CMakeLists.txt
index 6624e82..660c1c3 100644
--- a/src/m_gpg_info/CMakeLists.txt
+++ b/src/m_gpg_info/CMakeLists.txt
@@ -31,10 +31,6 @@ aux_source_directory(. INTEGRATED_MODULE_SOURCE)
# define libgpgfrontend_module
add_library(mod_gpg_info SHARED ${INTEGRATED_MODULE_SOURCE})
-# install dir
-install(TARGETS mod_gpg_info
- LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/modules")
-
# link sdk
target_link_libraries(mod_gpg_info PRIVATE
gpgfrontend_module_sdk)
@@ -57,4 +53,11 @@ qt_add_translations(mod_gpg_info
RESOURCE_PREFIX "/i18n"
TS_FILES ${TS_FILES}
SOURCES ${INTEGRATED_MODULE_SOURCE}
- INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}) \ No newline at end of file
+ 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
diff --git a/src/m_key_server_sync/CMakeLists.txt b/src/m_key_server_sync/CMakeLists.txt
index c15eed3..13e719d 100644
--- a/src/m_key_server_sync/CMakeLists.txt
+++ b/src/m_key_server_sync/CMakeLists.txt
@@ -31,10 +31,6 @@ aux_source_directory(. INTEGRATED_MODULE_SOURCE)
# define libgpgfrontend_module
add_library(mod_key_server_sync SHARED ${INTEGRATED_MODULE_SOURCE})
-# install dir
-install(TARGETS mod_key_server_sync
- LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/modules")
-
# link sdk
target_link_libraries(mod_key_server_sync PRIVATE
gpgfrontend_module_sdk)
@@ -44,3 +40,10 @@ 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
diff --git a/src/m_paper_key/CMakeLists.txt b/src/m_paper_key/CMakeLists.txt
index f7d0c03..f388a40 100644
--- a/src/m_paper_key/CMakeLists.txt
+++ b/src/m_paper_key/CMakeLists.txt
@@ -31,10 +31,6 @@ aux_source_directory(. INTEGRATED_MODULE_SOURCE)
# define libgpgfrontend_module
add_library(mod_paper_key SHARED ${INTEGRATED_MODULE_SOURCE})
-# install dir
-install(TARGETS mod_paper_key
- LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/modules")
-
# link sdk
target_link_libraries(mod_paper_key PRIVATE
gpgfrontend_module_sdk)
@@ -44,3 +40,10 @@ 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
diff --git a/src/m_pinentry/CMakeLists.txt b/src/m_pinentry/CMakeLists.txt
index 344fc38..7ab0e5d 100644
--- a/src/m_pinentry/CMakeLists.txt
+++ b/src/m_pinentry/CMakeLists.txt
@@ -40,10 +40,6 @@ list(APPEND INTEGRATED_MODULE_SOURCE "pinentry.qrc")
# define module
add_library(mod_pinentry SHARED ${INTEGRATED_MODULE_SOURCE})
-# install dir
-install(TARGETS mod_pinentry
- LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/modules")
-
# link options
# link sdk
@@ -55,3 +51,10 @@ 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}
+)
diff --git a/src/m_ver_check/CMakeLists.txt b/src/m_ver_check/CMakeLists.txt
index cdf691a..d064ac4 100644
--- a/src/m_ver_check/CMakeLists.txt
+++ b/src/m_ver_check/CMakeLists.txt
@@ -31,10 +31,6 @@ aux_source_directory(. INTEGRATED_MODULE_SOURCE)
# define libgpgfrontend_module
add_library(mod_ver_check SHARED ${INTEGRATED_MODULE_SOURCE})
-# install dir
-install(TARGETS mod_ver_check
- LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/modules")
-
# link sdk
target_link_libraries(mod_ver_check PRIVATE
gpgfrontend_module_sdk)
@@ -61,4 +57,11 @@ qt_add_translations(mod_ver_check
RESOURCE_PREFIX "/i18n"
TS_FILES ${TS_FILES}
SOURCES ${INTEGRATED_MODULE_SOURCE}
- INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}) \ No newline at end of file
+ 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