diff options
| author | Aleix Pol <aleixpol@kde.org> | 2019-07-23 11:13:40 +0200 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2019-07-23 15:55:33 +0200 |
| commit | d53f6e220d0d437925a818632ac84b606a740959 (patch) | |
| tree | d062c74862e5ee5556bc72d2a9dad2d5fe3b3e34 | |
| parent | a212a92190d4b85d9276af9ee70f66dd140fcdb0 (diff) | |
| download | extra-cmake-modules-d53f6e220d0d437925a818632ac84b606a740959.tar.gz extra-cmake-modules-d53f6e220d0d437925a818632ac84b606a740959.tar.bz2 | |
Provide a more sensible CMAKE_INSTALL_PREFIX default
Summary: If no prefix is passed, use ECM's by default, instead of defaulting to /usr/local which isn't optimal in any case.
Reviewers: cgiboudeaux
Reviewed By: cgiboudeaux
Subscribers: cgiboudeaux, kde-frameworks-devel, kde-buildsystem
Tags: #frameworks, #build_system
Differential Revision: https://phabricator.kde.org/D22676
| -rw-r--r-- | ECMConfig.cmake.in | 2 | ||||
| -rw-r--r-- | kde-modules/KDEInstallDirs.cmake | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ECMConfig.cmake.in b/ECMConfig.cmake.in index cea6e802..a518f953 100644 --- a/ECMConfig.cmake.in +++ b/ECMConfig.cmake.in @@ -6,6 +6,8 @@ set(ECM_MODULE_DIR "@PACKAGE_MODULES_INSTALL_DIR@") set(ECM_KDE_MODULE_DIR "@PACKAGE_KDE_MODULES_INSTALL_DIR@") +set(ECM_PREFIX "${PACKAGE_PREFIX_DIR}") + set(ECM_MODULE_PATH "${ECM_MODULE_DIR}" "${ECM_FIND_MODULE_DIR}" "${ECM_KDE_MODULE_DIR}") set(ECM_GLOBAL_FIND_VERSION "${ECM_FIND_VERSION}") diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake index 4e520377..a5b81708 100644 --- a/kde-modules/KDEInstallDirs.cmake +++ b/kde-modules/KDEInstallDirs.cmake @@ -426,7 +426,10 @@ if(APPLE) BUNDLE_INSTALL_DIR) endif() - +# Only supported since cmake 3.7 +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${ECM_PREFIX}" CACHE PATH "Install path prefix" FORCE) +endif() _define_absolute(EXECROOTDIR "" "executables and libraries" |