[Cmake-commits] CMake branch, next, updated. v2.8.7-3085-g7f2ecf8
Alexander Neundorf
neundorf at kde.org
Tue Mar 6 15:46:56 EST 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 7f2ecf88bc9eec8f9de2cdad70d14852f3170da6 (commit)
via e2e031c329f5eef5587279d52171e292512efd79 (commit)
via 228350a246bfb6c5bb0c3c5c304e6b3cc3dbfa7b (commit)
from 1772856682f36fbc7bdaee2d5712aad6b629f063 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f2ecf88bc9eec8f9de2cdad70d14852f3170da6
commit 7f2ecf88bc9eec8f9de2cdad70d14852f3170da6
Merge: 1772856 e2e031c
Author: Alexander Neundorf <neundorf at kde.org>
AuthorDate: Tue Mar 6 15:46:51 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 6 15:46:51 2012 -0500
Merge topic 'MakingConfigFilesEasier_ConfigureMacro' into next
e2e031c configure_package_config_file(): remove "HELPER_" infix
228350a configure_package_config_file(): fix wording
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e2e031c329f5eef5587279d52171e292512efd79
commit e2e031c329f5eef5587279d52171e292512efd79
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Mar 6 21:40:34 2012 +0100
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Mar 6 21:40:34 2012 +0100
configure_package_config_file(): remove "HELPER_" infix
Alex
diff --git a/Modules/CMakePackageConfigHelpers.cmake b/Modules/CMakePackageConfigHelpers.cmake
index 60b108e..b174e98 100644
--- a/Modules/CMakePackageConfigHelpers.cmake
+++ b/Modules/CMakePackageConfigHelpers.cmake
@@ -29,9 +29,9 @@
# resulting FooConfig.cmake file relocatable.
# Usage:
# 1. write a FooConfig.cmake.in file as you are used to
-# 2. insert a line containing only the string "@PACKAGE_HELPER_INIT@"
-# 3. instead of SET(FOO_DIR "@SOME_INSTALL_DIR@"), use SET(FOO_DIR "@PACKAGE_HELPER_SOME_INSTALL_DIR@")
-# (this must be after the @PACKAGE_HELPER_INIT@ line)
+# 2. insert a line containing only the string "@PACKAGE_INIT@"
+# 3. instead of SET(FOO_DIR "@SOME_INSTALL_DIR@"), use SET(FOO_DIR "@PACKAGE_SOME_INSTALL_DIR@")
+# (this must be after the @PACKAGE_INIT@ line)
# 4. instead of using the normal CONFIGURE_FILE(), use CONFIGURE_PACKAGE_CONFIG_FILE()
#
# The <input> and <output> arguments are the input and output file, the same way
@@ -42,7 +42,7 @@
#
# The variables <var1> to <varN> given as PATH_VARS are the variables which contain
# install destinations. For each of them the macro will create a helper variable
-# PACKAGE_HELPER_<var...>. These helper variables must be used
+# PACKAGE_<var...>. These helper variables must be used
# in the FooConfig.cmake.in file for setting the installed location. They are calculated
# by CONFIGURE_PACKAGE_CONFIG_FILE() so that they are always relative to the
# installed location of the package. This works both for relative and also for absolute locations.
@@ -102,10 +102,10 @@
# With a FooConfig.cmake.in:
# set(FOO_VERSION x.y.z)
# ...
-# @PACKAGE_HELPER_INIT@
+# @PACKAGE_INIT@
# ...
-# set_and_check(FOO_INCLUDE_DIR "@PACKAGE_HELPER_INCLUDE_INSTALL_DIR@")
-# set_and_check(FOO_SYSCONFIG_DIR "@PACKAGE_HELPER_SYSCONFIG_INSTALL_DIR@")
+# set_and_check(FOO_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
+# set_and_check(FOO_SYSCONFIG_DIR "@PACKAGE_SYSCONFIG_INSTALL_DIR@")
#=============================================================================
@@ -158,20 +158,20 @@ function(CONFIGURE_PACKAGE_CONFIG_FILE _inputFile _outputFile)
else()
if(IS_ABSOLUTE "${${var}}")
string(REPLACE "${CMAKE_INSTALL_PREFIX}" "\${PACKAGE_PREFIX_DIR}"
- PACKAGE_HELPER_${var} "${${var}}")
+ PACKAGE_${var} "${${var}}")
else()
- set(PACKAGE_HELPER_${var} "\${PACKAGE_PREFIX_DIR}/${${var}}")
+ set(PACKAGE_${var} "\${PACKAGE_PREFIX_DIR}/${${var}}")
endif()
endif()
endforeach()
- set(PACKAGE_HELPER_INIT "
-####### Expanded from @PACKAGE_HELPER_INIT@ by configure_package_config_file() #######
+ set(PACKAGE_INIT "
+####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/${PACKAGE_RELATIVE_PATH}\" ABSOLUTE)
")
if(NOT CCF_NO_SET_AND_CHECK_MACRO)
- set(PACKAGE_HELPER_INIT "${PACKAGE_HELPER_INIT}
+ set(PACKAGE_INIT "${PACKAGE_INIT}
macro(set_and_check _var _file)
set(\${_var} \"\${_file}\")
if(NOT EXISTS \"\${_file}\")
@@ -181,7 +181,7 @@ endmacro()
")
endif()
- set(PACKAGE_HELPER_INIT "${PACKAGE_HELPER_INIT}
+ set(PACKAGE_INIT "${PACKAGE_INIT}
####################################################################################")
configure_file("${_inputFile}" "${_outputFile}" @ONLY)
diff --git a/Tests/FindPackageTest/RelocatableConfig.cmake.in b/Tests/FindPackageTest/RelocatableConfig.cmake.in
index 607732a..7a34b2f 100644
--- a/Tests/FindPackageTest/RelocatableConfig.cmake.in
+++ b/Tests/FindPackageTest/RelocatableConfig.cmake.in
@@ -1,5 +1,5 @@
- at PACKAGE_HELPER_INIT@
+ at PACKAGE_INIT@
-set(RELOC_INCLUDE_DIR "@PACKAGE_HELPER_INCLUDE_INSTALL_DIR@")
-set(RELOC_SHARE_DIR "@PACKAGE_HELPER_SHARE_INSTALL_DIR@")
-set_and_check(RELOC_BUILD_DIR "@PACKAGE_HELPER_CURRENT_BUILD_DIR@")
+set(RELOC_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
+set(RELOC_SHARE_DIR "@PACKAGE_SHARE_INSTALL_DIR@")
+set_and_check(RELOC_BUILD_DIR "@PACKAGE_CURRENT_BUILD_DIR@")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=228350a246bfb6c5bb0c3c5c304e6b3cc3dbfa7b
commit 228350a246bfb6c5bb0c3c5c304e6b3cc3dbfa7b
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Mon Mar 5 23:00:26 2012 +0100
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Mon Mar 5 23:00:26 2012 +0100
configure_package_config_file(): fix wording
"configure_config_file()" was still used in some places instead
of "configure_package_config_file()"
Alex
diff --git a/Modules/CMakePackageConfigHelpers.cmake b/Modules/CMakePackageConfigHelpers.cmake
index e66999b..60b108e 100644
--- a/Modules/CMakePackageConfigHelpers.cmake
+++ b/Modules/CMakePackageConfigHelpers.cmake
@@ -138,11 +138,11 @@ function(CONFIGURE_PACKAGE_CONFIG_FILE _inputFile _outputFile)
cmake_parse_arguments(CCF "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
if(CCF_UNPARSED_ARGUMENTS)
- message(FATAL_ERROR "Unknown keywords given to CONFIGURE_CONFIG_FILE(): \"${CCF_UNPARSED_ARGUMENTS}\"")
+ message(FATAL_ERROR "Unknown keywords given to CONFIGURE_PACKAGE_CONFIG_FILE(): \"${CCF_UNPARSED_ARGUMENTS}\"")
endif()
if(NOT CCF_INSTALL_DESTINATION)
- message(FATAL_ERROR "No INSTALL_DESTINATION given to CONFIGURE_CONFIG_FILE()")
+ message(FATAL_ERROR "No INSTALL_DESTINATION given to CONFIGURE_PACKAGE_CONFIG_FILE()")
endif()
if(IS_ABSOLUTE "${CCF_INSTALL_DESTINATION}")
@@ -166,7 +166,7 @@ function(CONFIGURE_PACKAGE_CONFIG_FILE _inputFile _outputFile)
endforeach()
set(PACKAGE_HELPER_INIT "
-####### Expanded from @PACKAGE_HELPER_INIT@ by ConfigureConfigFile.cmake #######
+####### Expanded from @PACKAGE_HELPER_INIT@ by configure_package_config_file() #######
get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/${PACKAGE_RELATIVE_PATH}\" ABSOLUTE)
")
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakePackageConfigHelpers.cmake | 30 +++++++++++-----------
Tests/FindPackageTest/RelocatableConfig.cmake.in | 8 +++---
2 files changed, 19 insertions(+), 19 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list