summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Heinecke <aheinecke@intevation.de>2016-08-02 10:51:36 (GMT)
committerAndre Heinecke <aheinecke@intevation.de>2016-08-02 10:51:36 (GMT)
commit33797271eb6697e8a081340222f70663a9097e29 (patch)
treec13a97d228de74b375174e04008c899dca463be7
parent8466330425f7dea442084b12cbbb0dd0073f7594 (diff)
Explicitly look for Assuan2 in CMakeLists
Keeping the dependencies close together makes them easier to read and for tools to detect.
-rw-r--r--CMakeLists.txt3
-rw-r--r--ConfigureChecks.cmake1
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc6db56..ba17ee3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,7 @@ set(QT_REQUIRED_VERSION "5.4.0")
find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
include(ECMOptionalAddSubdirectory)
include(ECMInstallIcons)
@@ -74,6 +75,7 @@ find_package(KF5Gpgmepp ${GPGMEPP_VERSION} CONFIG REQUIRED)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Network PrintSupport)
+find_package(Assuan2)
set(HAVE_KCMUTILS ${KF5KCMUtils_FOUND})
@@ -105,7 +107,6 @@ endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version-kleopatra.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version-kleopatra.h)
-set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
include (ConfigureChecks.cmake)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-kleopatra.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kleopatra.h)
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index f03b85b..d2479e3 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -1,7 +1,6 @@
# assuan configure checks
include(CheckFunctionExists)
-find_package(Assuan2)
if ( ASSUAN2_FOUND )
set ( ASSUAN_SUFFIX "2" )
else ( ASSUAN2_FOUND )