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 d02456cb18822f74e2c67e7e080ffdff486e815b (commit)
via 8039bd0864aae15fd0d95db728159a85d72bf0f4 (commit)
via 8521a9e9cad06922dc316f2c3a82f0263bbd7e87 (commit)
from 9b0207a1d3b08d938509ac1b3f3368c0e0eaf137 (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=d02456cb18822f74e2c67e7e080ffdff486e815b
commit d02456cb18822f74e2c67e7e080ffdff486e815b
Merge: 9b0207a 8039bd0
Author: Alexander Neundorf <[email protected]>
AuthorDate: Thu Dec 6 16:25:58 2012 -0500
Commit: CMake Topic Stage <[email protected]>
CommitDate: Thu Dec 6 16:25:58 2012 -0500
Merge topic 'ConfigHelperMinorCommentFix' into next
8039bd0 CONFIGURE_PACKAGE_CONFIG_FILE(): improve generated comments
8521a9e CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8039bd0864aae15fd0d95db728159a85d72bf0f4
commit 8039bd0864aae15fd0d95db728159a85d72bf0f4
Author: Alex Neundorf <[email protected]>
AuthorDate: Thu Dec 6 22:24:43 2012 +0100
Commit: Alex Neundorf <[email protected]>
CommitDate: Thu Dec 6 22:24:43 2012 +0100
CONFIGURE_PACKAGE_CONFIG_FILE(): improve generated comments
CONFIGURE_PACKAGE_CONFIG_FILE() now additionally generates
"Any changes to this file will be overwritten by the next CMake run
The input file was FooConfig.cmake.in"
into the configured file.
Alex
diff --git a/Modules/CMakePackageConfigHelpers.cmake
b/Modules/CMakePackageConfigHelpers.cmake
index 96ecb42..a92ce7c 100644
--- a/Modules/CMakePackageConfigHelpers.cmake
+++ b/Modules/CMakePackageConfigHelpers.cmake
@@ -188,8 +188,13 @@ function(CONFIGURE_PACKAGE_CONFIG_FILE _inputFile
_outputFile)
endif()
endforeach()
+ get_filename_component(inputFileName "${_inputFile}" NAME)
+
set(PACKAGE_INIT "
####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
+####### Any changes to this file will be overwritten by the next CMake run ####
+####### The input file was ${inputFileName} ########
+
get_filename_component(PACKAGE_PREFIX_DIR
\"\${CMAKE_CURRENT_LIST_DIR}/${PACKAGE_RELATIVE_PATH}\" ABSOLUTE)
")
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakePackageConfigHelpers.cmake | 5 +++++
Source/CMakeVersion.cmake | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
