[Cmake-commits] [cmake-commits] alex committed cmGlobalUnixMakefileGenerator3.cxx 1.127 1.128

cmake-commits at cmake.org cmake-commits at cmake.org
Mon May 12 18:33:18 EDT 2008


Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv728

Modified Files:
	cmGlobalUnixMakefileGenerator3.cxx 
Log Message:
BUG: make ENABLE_LANGUAGE(ASM-ATT OPTIONAL) work again: if it didn't work
but was optional, don't delete the cache

Alex


Index: cmGlobalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalUnixMakefileGenerator3.cxx,v
retrieving revision 1.127
retrieving revision 1.128
diff -C 2 -d -r1.127 -r1.128
*** cmGlobalUnixMakefileGenerator3.cxx	24 Mar 2008 14:26:38 -0000	1.127
--- cmGlobalUnixMakefileGenerator3.cxx	12 May 2008 22:33:08 -0000	1.128
***************
*** 91,95 ****
        GetCacheManager()->GetCacheValue(langComp.c_str());
      std::string changeVars;
!     if(cname && (path != cname))
        {
        const char* cvars = 
--- 91,95 ----
        GetCacheManager()->GetCacheValue(langComp.c_str());
      std::string changeVars;
!     if(cname && (path != cname) && (optional==false))
        {
        const char* cvars = 



More information about the Cmake-commits mailing list