diff options
| author | l10n daemon script <scripty@kde.org> | 2015-11-08 21:01:33 +0000 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2015-11-08 21:01:33 +0000 |
| commit | 7feccae76e01a65b406995b5ba9526fe9ade4299 (patch) | |
| tree | 99011137f4dedcf4bf242e167ac7dc70d9136b8e /CMakeLists.txt | |
| parent | a1bb0b0488843165e606771b75a3a67ba8a131a6 (diff) | |
| parent | c88bc78e0ca3834c46b89ca9d14b404751da5d4a (diff) | |
| download | extra-cmake-modules-5.16.0.tar.gz extra-cmake-modules-5.16.0.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into local_releasev5.16.0-rc2v5.16.0
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c8e5f56..c1abd6c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) project(extra-cmake-modules NONE) -set(ECM_MAJOR_VERSION 1) -set(ECM_MINOR_VERSION 6) +set(ECM_MAJOR_VERSION 5) +set(ECM_MINOR_VERSION 16) set(ECM_PATCH_VERSION 0) set(ECM_VERSION ${ECM_MAJOR_VERSION}.${ECM_MINOR_VERSION}.${ECM_PATCH_VERSION}) @@ -14,7 +14,8 @@ if(BUILD_TESTING) add_subdirectory(tests) endif() -set(SHARE_INSTALL_DIR share) +set(SHARE_INSTALL_DIR share CACHE PATH "read-only architecture-independent data") +set(TOOLCHAIN_MODULES_INSTALL_DIR ${SHARE_INSTALL_DIR}/ECM/toolchain/) set(MODULES_INSTALL_DIR ${SHARE_INSTALL_DIR}/ECM/modules/) set(KDE_MODULES_INSTALL_DIR ${SHARE_INSTALL_DIR}/ECM/kde-modules/) set(FIND_MODULES_INSTALL_DIR ${SHARE_INSTALL_DIR}/ECM/find-modules/) @@ -33,6 +34,9 @@ install(FILES ${installKdeModuleFiles} DESTINATION ${KDE_MODULES_INSTALL_DIR}) file(GLOB installFindModuleFiles ${CMAKE_SOURCE_DIR}/find-modules/*[^~]) install(FILES ${installFindModuleFiles} DESTINATION ${FIND_MODULES_INSTALL_DIR}) +file(GLOB installToolchainModuleFiles ${CMAKE_SOURCE_DIR}/toolchain/*[^~]) +install(FILES ${installToolchainModuleFiles} DESTINATION ${TOOLCHAIN_MODULES_INSTALL_DIR}) + include(CMakePackageConfigHelpers) |