summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-03-03 13:32:56 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-03-03 13:32:56 (GMT)
commitad162206f02d9d726543a73c02ab5ed10f5e6522 (patch)
tree3688212f1268f5221ad65fbc63975d913ed7f7f7
parent9babde423cfdbb06d154f4fa1c7b7ac795154aff (diff)
parent3b9f963f3fb1db05e90cfad606c62a7b3e9b18dc (diff)
downloadCMake-ad162206f02d9d726543a73c02ab5ed10f5e6522.zip
CMake-ad162206f02d9d726543a73c02ab5ed10f5e6522.tar.gz
CMake-ad162206f02d9d726543a73c02ab5ed10f5e6522.tar.bz2
Merge topic 'cpack-strict-variable-selection'
3b9f963f CPack: be more stringent when selecting variables to encode
-rw-r--r--Modules/CPack.cmake2
1 files changed, 1 insertions, 1 deletions
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()