aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsaturneric <[email protected]>2024-07-29 01:46:38 +0000
committersaturneric <[email protected]>2024-07-29 01:46:38 +0000
commit6bde62db4a20e6ef7ee196a907b826a63858e831 (patch)
tree43fb89dbc18fe0270aa20e7b282df3b83199514b
parentfix: solve build issues on windows (diff)
downloadModules-6bde62db4a20e6ef7ee196a907b826a63858e831.tar.gz
Modules-6bde62db4a20e6ef7ee196a907b826a63858e831.zip
refactor: reformat build configs
-rw-r--r--CMakeLists.txt61
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/m_paper_key/CMakeLists.txt2
-rw-r--r--src/m_pinentry/CMakeLists.txt8
4 files changed, 37 insertions, 35 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b21174e..9815e35 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,14 +30,17 @@ set(CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_SOURCE_DIR}/cmake/FlagsOverrides.cma
# define project
project(GpgFrontendModules
- VERSION 2.1.3
- DESCRIPTION "Modules of GpgFrontend"
- HOMEPAGE_URL "https://gpgfrontend.bktus.com"
- LANGUAGES CXX)
+ VERSION 2.1.3
+ DESCRIPTION "Modules of GpgFrontend"
+ HOMEPAGE_URL "https://gpgfrontend.bktus.com"
+ LANGUAGES CXX)
# includes
include(GenerateExportHeader)
+# function or mode options
+option(GPGFRONTEND_QT5_BUILD "Swith to Qt5 building mode" OFF)
+
# Using Standard C++-17 (Consider compatibility)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -61,24 +64,24 @@ set(SDK_LIB_PATH "${SDK_PATH}/lib")
message(STATUS "SDK Path: ${SDK_PATH}")
include_directories(
- ${CMAKE_SOURCE_DIR}/include
- ${SDK_INCLUDE_PATH}
+ ${CMAKE_SOURCE_DIR}/include
+ ${SDK_INCLUDE_PATH}
)
link_directories(
- ${SDK_LIB_PATH}
+ ${SDK_LIB_PATH}
)
# Introduce Qt
# Support Qt version: 6.x
if(GPGFRONTEND_QT5_BUILD)
- # Introduce Qt
- # Support Qt version: 5.15.x
- find_package(Qt5 5.15 COMPONENTS Core Widgets Network LinguistTools REQUIRED)
+ # Introduce Qt
+ # Support Qt version: 5.15.x
+ find_package(Qt5 5.15 COMPONENTS Core Widgets Network LinguistTools REQUIRED)
else()
- # Introduce Qt
- # Support Qt version: 6.x
- find_package(Qt6 6 COMPONENTS Core Widgets Network LinguistTools REQUIRED)
+ # Introduce Qt
+ # Support Qt version: 6.x
+ find_package(Qt6 6 COMPONENTS Core Widgets Network LinguistTools REQUIRED)
endif()
# Qt configuration
@@ -89,24 +92,24 @@ set(CMAKE_AUTORCC_OPTIONS "--compress;9")
# rpath config
if(WIN32)
- message(STATUS "Configuring for Windows without rpath")
+ message(STATUS "Configuring for Windows without rpath")
elseif(APPLE)
- set(CMAKE_MACOSX_RPATH 1)
- set(CMAKE_INSTALL_RPATH "@loader_path/../lib")
-
- include_directories(
- /usr/local/include
- /opt/homebrew/include
- )
-
- link_directories(
- /usr/local/lib
- /opt/homebrew/lib
- )
+ set(CMAKE_MACOSX_RPATH 1)
+ set(CMAKE_INSTALL_RPATH "@loader_path/../lib")
+
+ include_directories(
+ /usr/local/include
+ /opt/homebrew/include
+ )
+
+ link_directories(
+ /usr/local/lib
+ /opt/homebrew/lib
+ )
else()
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
- set(CMAKE_INSTALL_RPATH "$ORIGIN:$ORIGIN/../lib")
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+ set(CMAKE_INSTALL_RPATH "$ORIGIN:$ORIGIN/../lib")
endif()
# third_party
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)
-