diff options
author | saturneric <[email protected]> | 2024-07-29 01:46:38 +0000 |
---|---|---|
committer | saturneric <[email protected]> | 2024-07-29 01:46:38 +0000 |
commit | 6bde62db4a20e6ef7ee196a907b826a63858e831 (patch) | |
tree | 43fb89dbc18fe0270aa20e7b282df3b83199514b /src | |
parent | fix: solve build issues on windows (diff) | |
download | Modules-6bde62db4a20e6ef7ee196a907b826a63858e831.tar.gz Modules-6bde62db4a20e6ef7ee196a907b826a63858e831.zip |
refactor: reformat build configs
Diffstat (limited to 'src')
-rw-r--r-- | src/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/m_paper_key/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/m_pinentry/CMakeLists.txt | 8 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f3861d8..5615150 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -24,6 +24,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # modules + add_subdirectory(m_ver_check) add_subdirectory(m_gpg_info) add_subdirectory(m_pinentry) diff --git a/src/m_paper_key/CMakeLists.txt b/src/m_paper_key/CMakeLists.txt index 0855aa8..61396c7 100644 --- a/src/m_paper_key/CMakeLists.txt +++ b/src/m_paper_key/CMakeLists.txt @@ -31,7 +31,7 @@ aux_source_directory(. INTEGRATED_MODULE_SOURCE) add_library(mod_paper_key SHARED ${INTEGRATED_MODULE_SOURCE}) # install dir -install(TARGETS mod_paper_key +install(TARGETS mod_paper_key LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/modules") # link sdk diff --git a/src/m_pinentry/CMakeLists.txt b/src/m_pinentry/CMakeLists.txt index c8b8473..b1e19bc 100644 --- a/src/m_pinentry/CMakeLists.txt +++ b/src/m_pinentry/CMakeLists.txt @@ -27,7 +27,8 @@ aux_source_directory(. INTEGRATED_MODULE_SOURCE) # capslock list(APPEND INTEGRATED_MODULE_SOURCE "capslock/capslock.cpp") -if (MINGW) + +if(MINGW) list(APPEND INTEGRATED_MODULE_SOURCE "capslock/capslock_win.cpp") else() list(APPEND INTEGRATED_MODULE_SOURCE "capslock/capslock_unix.cpp") @@ -39,10 +40,9 @@ list(APPEND INTEGRATED_MODULE_SOURCE "pinentry.qrc") add_library(mod_pinentry SHARED ${INTEGRATED_MODULE_SOURCE}) # install dir -install(TARGETS mod_pinentry +install(TARGETS mod_pinentry LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/modules") - # link options # link sdk @@ -57,7 +57,5 @@ else() target_link_libraries(mod_pinentry PUBLIC Qt6::Widgets) endif() - # using std c++ 17 target_compile_features(mod_pinentry PUBLIC cxx_std_17) - |