ENH: Several cleanups and make sure things get propagated where they should. Also, allow to load CTest custom files to the actual ctest -S script

1 files changed, 6 insertions, 9 deletions

diff --git a/Source/CTest/cmCTestBuildCommand.h b/Source/CTest/cmCTestBuildCommand.h
index 3f4c87a..b4f16b7 100644
--- a/Source/CTest/cmCTestBuildCommand.h
+++ b/Source/CTest/cmCTestBuildCommand.h
@@ -17,7 +17,7 @@
 #ifndef cmCTestBuildCommand_h
 #define cmCTestBuildCommand_h
 
-#include "cmCTestCommand.h"
+#include "cmCTestHandlerCommand.h"
 
 class cmGlobalGenerator;
 
@@ -26,7 +26,7 @@ class cmGlobalGenerator;
  *
  * cmCTestBuildCommand defineds the command to build the project.
  */
-class cmCTestBuildCommand : public cmCTestCommand
+class cmCTestBuildCommand : public cmCTestHandlerCommand
 {
 public:
 
@@ -45,12 +45,6 @@ public:
     }
 
   /**
-   * This is called when the command is first encountered in
-   * the CMakeLists.txt file.
-   */
-  virtual bool InitialPass(std::vector<std::string> const& args);
-
-  /**
    * The name of the command as specified in CMakeList.txt.
    */
   virtual const char* GetName() { return "CTEST_BUILD";}
@@ -73,9 +67,12 @@ public:
       "Builds the given build directory and stores results in Build.xml.";
     }
 
-  cmTypeMacro(cmCTestBuildCommand, cmCTestCommand);
+  cmTypeMacro(cmCTestBuildCommand, cmCTestHandlerCommand);
 
   cmGlobalGenerator* GlobalGenerator;
+
+protected:
+  cmCTestGenericHandler* InitializeHandler();
 };