[cmake-commits] king committed cmLocalVisualStudio6Generator.cxx 1.131 1.132 cmLocalVisualStudio7Generator.cxx 1.201 1.202

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Nov 9 15:08:58 EST 2007


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

Modified Files:
	cmLocalVisualStudio6Generator.cxx 
	cmLocalVisualStudio7Generator.cxx 
Log Message:
ENH: Removed dependency on Templates/CMakeWindowsSystemConfig.cmake which is no longer used.  Also removed the file itself.


Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -d -r1.201 -r1.202
--- cmLocalVisualStudio7Generator.cxx	9 Nov 2007 17:05:03 -0000	1.201
+++ cmLocalVisualStudio7Generator.cxx	9 Nov 2007 20:08:56 -0000	1.202
@@ -204,23 +204,7 @@
                   START_OUTPUT, UNCHANGED, true);
   commandLine.push_back(args);
 
-  std::string configFile =
-    this->Makefile->GetRequiredDefinition("CMAKE_ROOT");
-  configFile += "/Templates/CMakeWindowsSystemConfig.cmake";
-  std::vector<std::string> listFiles = this->Makefile->GetListFiles();
-  bool found = false;
-  for(std::vector<std::string>::iterator i = listFiles.begin();
-      i != listFiles.end(); ++i)
-    {
-    if(*i == configFile)
-      {
-      found  = true;
-      }
-    }
-  if(!found)
-    {
-    listFiles.push_back(configFile);
-    }
+  std::vector<std::string> const& listFiles = this->Makefile->GetListFiles();
 
   cmCustomCommandLines commandLines;
   commandLines.push_back(commandLine);

Index: cmLocalVisualStudio6Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio6Generator.cxx,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- cmLocalVisualStudio6Generator.cxx	10 Aug 2007 17:02:59 -0000	1.131
+++ cmLocalVisualStudio6Generator.cxx	9 Nov 2007 20:08:55 -0000	1.132
@@ -217,23 +217,7 @@
                   START_OUTPUT, UNCHANGED, true);
   commandLine.push_back(args);
 
-  std::string configFile = 
-    this->Makefile->GetRequiredDefinition("CMAKE_ROOT");
-  configFile += "/Templates/CMakeWindowsSystemConfig.cmake";
-  std::vector<std::string> listFiles = this->Makefile->GetListFiles();
-  bool found = false;
-  for(std::vector<std::string>::iterator i = listFiles.begin();
-      i != listFiles.end(); ++i)
-    {
-    if(*i == configFile)
-      {
-      found  = true;
-      }
-    }
-  if(!found)
-    {
-    listFiles.push_back(configFile);
-    }
+  std::vector<std::string> const& listFiles = this->Makefile->GetListFiles();
 
   cmCustomCommandLines commandLines;
   commandLines.push_back(commandLine);



More information about the Cmake-commits mailing list