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

List:       kde-commits
Subject:    [kactivities/frameworks] /: Use ecm_configure_package_config_file
From:       Alex Merry <kde () randomguy3 ! me ! uk>
Date:       2014-02-18 19:49:03
Message-ID: E1WFqf9-0005jS-Fh () scm ! kde ! org
[Download RAW message or body]

Git commit 4dec13194e978bbc94f1f39035b0ff45556f8c59 by Alex Merry.
Committed on 18/02/2014 at 16:15.
Pushed by alexmerry into branch 'frameworks'.

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
and then manually edited due to an extra space.

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

M  +2    -2    CMakeLists.txt

http://commits.kde.org/kactivities/4dec13194e978bbc94f1f39035b0ff45556f8c59

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce02c44..72b3c0d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,7 @@ find_package (KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRE=
D)
 # Basic includes
 include (CPack)
 include (FeatureSummary)
-include (CMakePackageConfigHelpers)
+include (ECMCMakePackageConfigHelpers)
 include (ECMSetupVersion)
 =

 =

@@ -66,7 +66,7 @@ install(EXPORT KF5ActivitiesLibraryTargets
 # create a Config.cmake and a ConfigVersion.cmake file and install them
 set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5Activities")
 =

-configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5ActivitiesCo=
nfig.cmake.in"
+ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5Activiti=
esConfig.cmake.in"
    "${CMAKE_CURRENT_BINARY_DIR}/KF5ActivitiesConfig.cmake"
                               INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_D=
IR}
                               PATH_VARS  INCLUDE_INSTALL_DIR CMAKE_INSTALL=
_PREFIX )
[prev in list] [next in list] [prev in thread] [next in thread]