[Cmake-commits] [cmake-commits] hoffman committed cmake.cxx 1.392 1.393
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Aug 19 13:31:23 EDT 2008
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv31901
Modified Files:
cmake.cxx
Log Message:
BUG: 7448 fix crash in ccmake when compiler is changed
Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.392
retrieving revision 1.393
diff -C 2 -d -r1.392 -r1.393
*** cmake.cxx 31 Jul 2008 17:36:53 -0000 1.392
--- cmake.cxx 19 Aug 2008 17:31:21 -0000 1.393
***************
*** 1872,1876 ****
// erase the property to avoid infinite recursion
this->SetProperty("__CMAKE_DELETE_CACHE_CHANGE_VARS_", "");
!
cmCacheManager::CacheIterator ci = this->CacheManager->NewIterator();
std::vector<SaveCacheEntry> saved;
--- 1872,1879 ----
// erase the property to avoid infinite recursion
this->SetProperty("__CMAKE_DELETE_CACHE_CHANGE_VARS_", "");
! if(this->GetIsInTryCompile())
! {
! return 0;
! }
cmCacheManager::CacheIterator ci = this->CacheManager->NewIterator();
std::vector<SaveCacheEntry> saved;
More information about the Cmake-commits
mailing list