aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Becker <[email protected]>2017-11-14 23:35:32 +0100
committerHeiko Becker <[email protected]>2017-11-15 09:58:37 +0100
commite5d9d0356fa30c6da61cccaea0cd5e42961013d4 (patch)
tree9af32cb20f59699eb35648c1b0393107dbfb0e75
parent23b82a7750b83a0d5dc0671d05971b684e708e1d (diff)
Unbreak the build with ECM < 5.41.0
* set(CMAKE_MODULE_PATH ...)" isn't cumulative * CMAKECONFIG_INSTALL_DIR used for the installation of FindSasl2 is only set later on
-rw-r--r--CMakeLists.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 236495c..ff1f5c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,8 +11,7 @@ set(CMAKE_MODULE_PATH ${KLdap_SOURCE_DIR}/cmake ${ECM_MODULE_PATH})
# TODO: Remove the cmake/deprecated directory when we'll require ECM >= 5.41.0
if("${ECM_VERSION}" VERSION_LESS "5.41.0")
- set(CMAKE_MODULE_PATH ${KLdap_SOURCE_DIR}/cmake/deprecated)
- add_subdirectory(cmake/deprecated)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${KLdap_SOURCE_DIR}/cmake/deprecated)
endif()
include(GenerateExportHeader)
@@ -27,8 +26,6 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(ECMQtDeclareLoggingCategory)
include(ECMCoverageOption)
-
-
set(KLDAP_LIB_VERSION ${PIM_VERSION})
find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
@@ -96,6 +93,10 @@ install(FILES
########### Targets ###########
add_subdirectory(cmake)
+# TODO: Remove the cmake/deprecated directory when we'll require ECM >= 5.41.0
+if("${ECM_VERSION}" VERSION_LESS "5.41.0")
+ add_subdirectory(cmake/deprecated)
+endif()
add_subdirectory(src)
add_subdirectory(kioslave)
if(BUILD_TESTING)