Commit 33797271 authored by Andre Heinecke's avatar Andre Heinecke

Explicitly look for Assuan2 in CMakeLists

Keeping the dependencies close together makes them easier to
read and for tools to detect.
parent 84663304
......@@ -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)
......
# assuan configure checks
include(CheckFunctionExists)
find_package(Assuan2)
if ( ASSUAN2_FOUND )
set ( ASSUAN_SUFFIX "2" )
else ( ASSUAN2_FOUND )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment