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

List:       kde-commits
Subject:    [solid] /: Use ecm_configure_package_config_file
From:       Alex Merry <kde () randomguy3 ! me ! uk>
Date:       2014-02-18 19:47:06
Message-ID: E1WFqdG-0005bj-Fr () scm ! kde ! org
[Download RAW message or body]

Git commit 16cf9e96d633d8e63c140822106a47588048bbd4 by Alex Merry.
Committed on 18/02/2014 at 16:13.
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

http://commits.kde.org/solid/16cf9e96d633d8e63c140822106a47588048bbd4

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7770f5..2546a1f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ endif()
 =

 include(FeatureSummary)
 include(GenerateExportHeader)
-include(CMakePackageConfigHelpers)
+include(ECMPackageConfigHelpers)
 include(ECMSetupVersion)
 include(ECMGenerateHeaders)
 =

@@ -88,7 +88,7 @@ add_subdirectory(tests)
 # create a Config.cmake and a ConfigVersion.cmake file and install them
 set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5Solid")
 =

-configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5SolidConfig.=
cmake.in"
+ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5SolidCon=
fig.cmake.in"
                               "${CMAKE_CURRENT_BINARY_DIR}/KF5SolidConfig.=
cmake"
                               INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_D=
IR}
                               )
[prev in list] [next in list] [prev in thread] [next in thread]