Page MenuHome GnuPG
Files F34134266

No OneTemporary
Actions

View Options

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a2dbd4b..2ec9db8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,56 +1,64 @@
# Copyright (C) 2018 by Intevation GmbH <info@intevation.de>
#
# This file is Free Software under the GNU GPL (v>=2)
# and comes with ABSOLUTELY NO WARRANTY!
# See LICENSE.txt for details.
cmake_minimum_required(VERSION 3.5.0)
project(gpg4win-tools)
-set(PRETTY_NAME cryp.do)
### Generic Setup
-set(KF_VERSION "5.240.0")
-set(GPGME_REQUIRED_VERSION "1.13.1")
-set(QT_REQUIRED_VERSION "6.4.0")
+set(QT_MIN_VERSION "5.15.0")
+set(KF_MIN_VERSION "5.100.0")
set(LIBKLEO_VERSION "5.17.44")
-#Old qtmain linking behavior to be compatible with cmake versions < 2.8.11
-
-if(POLICY CMP0020)
- cmake_policy(SET CMP0020 OLD)
+if (QT_MAJOR_VERSION STREQUAL "6")
+ set(QT_MIN_VERSION "6.6.0")
+ set(KF_MIN_VERSION "6.0.0")
+ set(LIBKLEO_VERSION "6.1.40")
endif()
-find_package(Qt6 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets)
+if (NOT QT_MAJOR_VERSION)
+ set(QT_MAJOR_VERSION "5")
+endif ()
-find_package(Gpgmepp ${GPGME_REQUIRED_VERSION} CONFIG REQUIRED)
-find_package(QGpgmeQt6 ${GPGME_REQUIRED_VERSION} CONFIG REQUIRED)
-find_package(KPim6Libkleo ${LIBKLEO_VERSION} CONFIG REQUIRED)
-find_package(KF6WidgetsAddons ${KF_VERSION} CONFIG REQUIRED)
-find_package(KF6IconThemes ${KF_VERSION} CONFIG REQUIRED)
+set(GPGME_REQUIRED_VERSION "1.13.1")
+
+set(LIBKLEO_VERSION "5.17.44")
+
+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets)
+find_package(Gpgmepp ${GPGME_REQUIRED_VERSION} CONFIG REQUIRED)
+find_package(KF${QT_MAJOR_VERSION}WidgetsAddons ${KF_MIN_VERSION} REQUIRED)
+find_package(KF${QT_MAJOR_VERSION}IconThemes ${KF_MIN_VERSION} REQUIRED)
+find_package(KPim${QT_MAJOR_VERSION}Libkleo ${LIBKLEO_VERSION} CONFIG REQUIRED)
+if (QT_MAJOR_VERSION STREQUAL "6")
+ find_package(QGpgmeQt6 ${GPGME_REQUIRED_VERSION} CONFIG REQUIRED)
+else()
+ find_package(QGpgme ${GPGME_REQUIRED_VERSION} CONFIG REQUIRED)
+endif()
set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
if(WIN32)
add_definitions(-D_WIN32_WINNT=0x0600) # Windows vista
add_definitions(-DWINVER=0x0600)
add_definitions(-DUNICODE -D_UNICODE)
add_definitions(-DMINGW_HAS_SECURE_API) # for _s functions
endif(WIN32)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
# Cmake does not correctly identify gcc windres when cross compiling
# making this line neccessary to set the correct flags for it.
# See: http://public.kitware.com/Bug/view.php?id=11773
SET(CMAKE_RC_COMPILE_OBJECT
"<CMAKE_RC_COMPILER> <FLAGS> <DEFINES> -Ocoff <SOURCE> <OBJECT>")
#add_subdirectory(img)
### Include the actual source directories
add_subdirectory(src)
diff --git a/src/gpgolconfig/CMakeLists.txt b/src/gpgolconfig/CMakeLists.txt
index c3d7654..da77dca 100644
--- a/src/gpgolconfig/CMakeLists.txt
+++ b/src/gpgolconfig/CMakeLists.txt
@@ -1,42 +1,46 @@
# Copyright (C) 2018 Intevation GmbH <info@intevation.de>
#
# This file is Free Software under the GNU GPL (v>=2)
# and comes with ABSOLUTELY NO WARRANTY!
# See LICENSE.txt for details.
set(EXECUTABLE_NAME "gpgolconfig")
set(EXECUTABLE_SRC
main.cpp
gpgolconfig-options.h
gpgolconfig.cpp
gpgolconfigpage.cpp
gpgoldebugpage.cpp
cryptoconfigpage.cpp
${CMAKE_SOURCE_DIR}/src/img/icon.rc
${CMAKE_SOURCE_DIR}/src/util/strhelp.c
${CMAKE_SOURCE_DIR}/src/util/w32-util.cpp
${CMAKE_SOURCE_DIR}/src/util/w32-qt-util.cpp
${CMAKE_SOURCE_DIR}/src/util/w32-gettext.c
)
qt_add_resources(EXECUTABLE_SRC gpgolconfig.qrc)
add_executable(${EXECUTABLE_NAME}
${_add_executable_params}
${EXECUTABLE_SRC}
)
target_link_libraries(${EXECUTABLE_NAME}
Qt::Widgets
- KF6::WidgetsAddons
- KPim6::Libkleo
+ KF${QT_MAJOR_VERSION}::WidgetsAddons
+ KPim${QT_MAJOR_VERSION}::Libkleo
Gpgmepp
- QGpgmeQt6
)
+if (QT_MAJOR_VERSION STREQUAL "6")
+ target_link_libraries(${EXECUTABLE_NAME} QGpgmeQt6)
+else()
+ target_link_libraries(${EXECUTABLE_NAME} QGpgme)
+endif()
if (WIN32)
set_target_properties(${EXECUTABLE_NAME} PROPERTIES LINK_FLAGS "-municode")
endif(WIN32)
install(TARGETS ${EXECUTABLE_NAME} DESTINATION bin)
diff --git a/src/resolver/CMakeLists.txt b/src/resolver/CMakeLists.txt
index 2035ed4..4f50934 100644
--- a/src/resolver/CMakeLists.txt
+++ b/src/resolver/CMakeLists.txt
@@ -1,36 +1,41 @@
# Copyright (C) 2018 Intevation GmbH <info@intevation.de>
#
# This file is Free Software under the GNU GPL (v>=2)
# and comes with ABSOLUTELY NO WARRANTY!
# See LICENSE.txt for details.
set(EXECUTABLE_NAME "resolver")
set(EXECUTABLE_SRC
main.cpp
resolver.cpp
${CMAKE_SOURCE_DIR}/src/img/icon.rc
${CMAKE_SOURCE_DIR}/src/util/overlay.cpp
${CMAKE_SOURCE_DIR}/src/util/w32-util.cpp
${CMAKE_SOURCE_DIR}/src/util/w32-qt-util.cpp
${CMAKE_SOURCE_DIR}/src/util/strhelp.c
)
add_executable(${EXECUTABLE_NAME}
${_add_executable_params}
${EXECUTABLE_SRC}
)
target_link_libraries(${EXECUTABLE_NAME}
Qt::Widgets
- KF6::IconThemes
- KPim6::Libkleo
+ KF${QT_MAJOR_VERSION}::IconThemes
+ KPim${QT_MAJOR_VERSION}::Libkleo
Gpgmepp
- QGpgmeQt6
)
+if (QT_MAJOR_VERSION STREQUAL "6")
+ target_link_libraries(${EXECUTABLE_NAME} QGpgmeQt6)
+else()
+ target_link_libraries(${EXECUTABLE_NAME} QGpgme)
+endif()
+
if (WIN32)
set_target_properties(${EXECUTABLE_NAME} PROPERTIES LINK_FLAGS "-municode")
endif(WIN32)
install(TARGETS ${EXECUTABLE_NAME} DESTINATION bin)

File Metadata

Mime Type
text/x-diff
Expires
Mon, Dec 8, 6:52 AM (1 d, 7 h)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
f5/ee/bc8a2011afe4992678af5c8abb8e

Event Timeline