[cmake-commits] alex committed cmCTestScriptHandler.cxx 1.40 1.41

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Jul 27 09:00:01 EDT 2007


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

Modified Files:
	cmCTestScriptHandler.cxx 
Log Message:

ENH: deb generator can now generate deb packages
-remove the unscriptable commands also from the cpack cmake
-use CPACK_PACKAGE_CONTACT in CMakeCPack.cmake, it's used in the nsis and
the deb generator
-make set_properties() scriptable
-use a non-const char array for adding the python modules

Alex


Index: cmCTestScriptHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestScriptHandler.cxx,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- cmCTestScriptHandler.cxx	20 Jul 2007 12:36:16 -0000	1.40
+++ cmCTestScriptHandler.cxx	27 Jul 2007 12:59:59 -0000	1.41
@@ -303,25 +303,7 @@
 
   // remove all cmake commands which are not scriptable, since they can't be 
   // used in ctest scripts
-  std::vector<std::string> unscriptableCommands;
-  cmake::RegisteredCommandsMap* commands = this->CMake->GetCommands();
-  for (cmake::RegisteredCommandsMap::const_iterator pos = commands->begin();
-       pos != commands->end();
-       ++pos)
-    {
-    if (!pos->second->IsScriptable())
-      {
-      unscriptableCommands.push_back(pos->first);
-      }
-    }
-
-  for(std::vector<std::string>::const_iterator it=unscriptableCommands.begin();
-      it != unscriptableCommands.end();
-      ++it)
-    {
-//    fprintf(stderr, "Removing %s\n", it->c_str());
-    this->CMake->RemoveCommand(it->c_str());
-    }
+  this->CMake->RemoveUnscriptableCommands();
 
   // add any ctest specific commands, probably should have common superclass
   // for ctest commands to clean this up. If a couple more commands are



More information about the Cmake-commits mailing list