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 b80f57d14676b2f639554496c0b9d19c67e0aa2b (commit)
via 3b9f963f3fb1db05e90cfad606c62a7b3e9b18dc (commit)
from 0c438b962c6585043dc055d3e4b6aaa2e99e090e (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=b80f57d14676b2f639554496c0b9d19c67e0aa2b
commit b80f57d14676b2f639554496c0b9d19c67e0aa2b
Merge: 0c438b9 3b9f963
Author: Brad King <[email protected]>
AuthorDate: Mon Mar 2 09:06:04 2015 -0500
Commit: CMake Topic Stage <[email protected]>
CommitDate: Mon Mar 2 09:06:04 2015 -0500
Merge topic 'cpack-strict-variable-selection' into next
3b9f963f CPack: be more stringent when selecting variables to encode
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b9f963f3fb1db05e90cfad606c62a7b3e9b18dc
commit 3b9f963f3fb1db05e90cfad606c62a7b3e9b18dc
Author: Роман Донченко <[email protected]>
AuthorDate: Sun Mar 1 02:38:52 2015 +0300
Commit: Brad King <[email protected]>
CommitDate: Mon Mar 2 09:01:31 2015 -0500
CPack: be more stringent when selecting variables to encode
The old version would admit, for example, a variable named "xxxCPACK".
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index ce1536e..532596d 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -314,7 +314,7 @@ macro(cpack_encode_variables)
set(_CPACK_OTHER_VARIABLES_)
get_cmake_property(res VARIABLES)
foreach(var ${res})
- if("xxx${var}" MATCHES "xxxCPACK")
+ if(var MATCHES "^CPACK")
set(_CPACK_OTHER_VARIABLES_
"${_CPACK_OTHER_VARIABLES_}\nSET(${var} \"${${var}}\")")
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/CPack.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/mailman/listinfo/cmake-commits
