[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2048-gdce4d5b
Brad King
brad.king at kitware.com
Fri Feb 8 16:38:58 EST 2013
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 dce4d5b470f1581e8f15ef4f5d24e73297da63a5 (commit)
via ccfeefae356241cd05ed06f595c697379620e512 (commit)
from 1e8d99a0988c8781283b1adfe092727ff2832e0d (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=dce4d5b470f1581e8f15ef4f5d24e73297da63a5
commit dce4d5b470f1581e8f15ef4f5d24e73297da63a5
Merge: 1e8d99a ccfeefa
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 8 16:38:55 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 8 16:38:55 2013 -0500
Merge topic 'empty-compiler-crash' into next
ccfeefa Fix crash on empty CMAKE_<lang>_COMPILER value (#13901)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ccfeefae356241cd05ed06f595c697379620e512
commit ccfeefae356241cd05ed06f595c697379620e512
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 8 16:33:52 2013 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 8 16:33:52 2013 -0500
Fix crash on empty CMAKE_<lang>_COMPILER value (#13901)
Since commit fd33bf93 (fix for bug 6102, allow users to change the
compiler, 2007-12-13) we keep an internal ;-list of language compiler
variable and value pairs. Preserve empty values on expansion to ensure
that the key/value pairing remains consistent.
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index d57e981..036440a 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2084,7 +2084,7 @@ struct SaveCacheEntry
int cmake::HandleDeleteCacheVariables(const char* var)
{
std::vector<std::string> argsSplit;
- cmSystemTools::ExpandListArgument(std::string(var), argsSplit);
+ cmSystemTools::ExpandListArgument(std::string(var), argsSplit, true);
// erase the property to avoid infinite recursion
this->SetProperty("__CMAKE_DELETE_CACHE_CHANGE_VARS_", "");
if(this->GetIsInTryCompile())
-----------------------------------------------------------------------
Summary of changes:
Source/cmake.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list