[Cmake-commits] [cmake-commits] king committed cmMakefileTargetGenerator.cxx 1.111 1.112

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Feb 2 14:36:55 EST 2009


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

Modified Files:
	cmMakefileTargetGenerator.cxx 
Log Message:
BUG: Fix preprocess and assembly rule expansion

The recent change to avoid expanding rule variables in informational and
'cd' commands broke the logical order in generation of preprocess and
assembly rules.  This corrects the order.


Index: cmMakefileTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileTargetGenerator.cxx,v
retrieving revision 1.111
retrieving revision 1.112
diff -C 2 -d -r1.111 -r1.112
*** cmMakefileTargetGenerator.cxx	2 Feb 2009 18:28:17 -0000	1.111
--- cmMakefileTargetGenerator.cxx	2 Feb 2009 19:36:53 -0000	1.112
***************
*** 725,728 ****
--- 725,734 ----
          cmSystemTools::ExpandListArgument(preprocessRule, preprocessCommands);
  
+         std::string shellObjI =
+           this->Convert(objI.c_str(),
+                         cmLocalGenerator::NONE,
+                         cmLocalGenerator::SHELL).c_str();
+         vars.PreprocessedSource = shellObjI.c_str();
+ 
          // Expand placeholders in the commands.
          for(std::vector<std::string>::iterator i = preprocessCommands.begin();
***************
*** 739,748 ****
                          preprocessCommands.begin(),
                          preprocessCommands.end());
- 
-         std::string shellObjI =
-           this->Convert(objI.c_str(),
-                         cmLocalGenerator::NONE,
-                         cmLocalGenerator::SHELL).c_str();
-         vars.PreprocessedSource = shellObjI.c_str();
          }
        else
--- 745,748 ----
***************
*** 782,785 ****
--- 782,791 ----
          cmSystemTools::ExpandListArgument(assemblyRule, assemblyCommands);
  
+         std::string shellObjS =
+           this->Convert(objS.c_str(),
+                         cmLocalGenerator::NONE,
+                         cmLocalGenerator::SHELL).c_str();
+         vars.AssemblySource = shellObjS.c_str();
+ 
          // Expand placeholders in the commands.
          for(std::vector<std::string>::iterator i = assemblyCommands.begin();
***************
*** 796,805 ****
                          assemblyCommands.begin(),
                          assemblyCommands.end());
- 
-         std::string shellObjS =
-           this->Convert(objS.c_str(),
-                         cmLocalGenerator::NONE,
-                         cmLocalGenerator::SHELL).c_str();
-         vars.AssemblySource = shellObjS.c_str();
          }
        else
--- 802,805 ----



More information about the Cmake-commits mailing list