[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [plasma-framework] /: Use ecm_configure_package_config_file
From:       Alex Merry <kde () randomguy3 ! me ! uk>
Date:       2014-02-18 21:25:48
Message-ID: E1WFsAm-00067O-Ng () scm ! kde ! org
[Download RAW message or body]

Git commit 596abe8c683db4720f6087abe6b794c832d2ef5f by Alex Merry.
Committed on 18/02/2014 at 16:14.
Pushed by alexmerry into branch 'master'.

Use ecm_configure_package_config_file

Ported with:
sed -i -e 's/\(include(\)CMake\(PackageConfigHelpers)\)/\1ECM\2/' \
       -e 's/\<\(configure_package_config_file\)/ecm_\1/' \
       CMakeLists.txt

See http://commits.kde.org/extra-cmake-modules/139f60d81653888f696ef433

M  +2    -2    CMakeLists.txt
M  +1    -1    src/plasmaquick/CMakeLists.txt

http://commits.kde.org/plasma-framework/596abe8c683db4720f6087abe6b794c832d=
2ef5f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 084fd6d..a1b39f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -142,7 +142,7 @@ configure_file(config-compiler.h.cmake ${CMAKE_CURRENT_=
BINARY_DIR}/config-compil
 ################ create PlasmaConfig.cmake and install it ################=
###########
 =

 # create a Config.cmake and a ConfigVersion.cmake file and install them
-include(CMakePackageConfigHelpers)
+include(ECMPackageConfigHelpers)
 =

 include(ECMSetupVersion)
 ecm_setup_version(${KF5_VERSION}
@@ -153,7 +153,7 @@ ecm_setup_version(${KF5_VERSION}
 =

 set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5Plasma")
 =

-configure_package_config_file(
+ecm_configure_package_config_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/KF5PlasmaConfig.cmake.in"
   "${CMAKE_CURRENT_BINARY_DIR}/KF5PlasmaConfig.cmake"
   INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_DIR}
diff --git a/src/plasmaquick/CMakeLists.txt b/src/plasmaquick/CMakeLists.txt
index 86e4249..7e31b31 100644
--- a/src/plasmaquick/CMakeLists.txt
+++ b/src/plasmaquick/CMakeLists.txt
@@ -53,7 +53,7 @@ install(DIRECTORY
 =

 set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5PlasmaQuick")
 =

-configure_package_config_file(
+ecm_configure_package_config_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/KF5PlasmaQuickConfig.cmake.in"
     "${CMAKE_CURRENT_BINARY_DIR}/KF5PlasmaQuickConfig.cmake"
     INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_DIR}
[prev in list] [next in list] [prev in thread] [next in thread]