[cmake-commits] king committed cmLocalGenerator.cxx 1.265 1.266

cmake-commits at cmake.org cmake-commits at cmake.org
Sat Mar 1 09:08:36 EST 2008


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

Modified Files:
	cmLocalGenerator.cxx 
Log Message:
BUG: Do not place $(CMAKE_COMMAND) in link scripts.


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -d -r1.265 -r1.266
--- cmLocalGenerator.cxx	14 Feb 2008 20:31:08 -0000	1.265
+++ cmLocalGenerator.cxx	1 Mar 2008 14:08:34 -0000	1.266
@@ -938,6 +938,12 @@
       return replaceValues.LinkLibraries;
       }
     }
+  if(variable == "CMAKE_COMMAND")
+    {
+    const char* cmcommand =
+      this->GlobalGenerator->GetCMakeInstance()->GetCMakeCommand();
+    return this->Convert(cmcommand, FULL, SHELL);
+    }
   std::vector<std::string> enabledLanguages;
   this->GlobalGenerator->GetEnabledLanguages(enabledLanguages);
   // loop over language specific replace variables



More information about the Cmake-commits mailing list