[Cmake-commits] [cmake-commits] zach.mullen committed cmCTestBuildCommand.cxx 1.21 1.22 cmCTestBuildCommand.h 1.10 1.11

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTestBuildCommand.cxx cmCTestBuildCommand.h 
Log Message:
Added TARGET, CONFIGURATION, PROJECT_NAME, and FLAGS arguments to ctest_build command


Index: cmCTestBuildCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildCommand.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -C 2 -d -r1.21 -r1.22
*** cmCTestBuildCommand.cxx	28 Sep 2009 15:42:57 -0000	1.21
--- cmCTestBuildCommand.cxx	3 Nov 2009 21:46:30 -0000	1.22
***************
*** 24,28 ****
    this->GlobalGenerator = 0;
    this->Arguments[ctb_NUMBER_ERRORS] = "NUMBER_ERRORS";
!   this->Arguments[ctb_NUMBER_WARNINGS] = "NUMBER_WARNINGS"; 
    this->Arguments[ctb_LAST] = 0;
    this->Last = ctb_LAST;
--- 24,32 ----
    this->GlobalGenerator = 0;
    this->Arguments[ctb_NUMBER_ERRORS] = "NUMBER_ERRORS";
!   this->Arguments[ctb_NUMBER_WARNINGS] = "NUMBER_WARNINGS";
!   this->Arguments[ctb_TARGET] = "TARGET";
!   this->Arguments[ctb_CONFIGURATION] = "CONFIGURATION";
!   this->Arguments[ctb_FLAGS] = "FLAGS";
!   this->Arguments[ctb_PROJECT_NAME] = "PROJECT_NAME";
    this->Arguments[ctb_LAST] = 0;
    this->Last = ctb_LAST;
***************
*** 61,71 ****
        = this->Makefile->GetDefinition("CTEST_CMAKE_GENERATOR");
      const char* cmakeProjectName
!       = this->Makefile->GetDefinition("CTEST_PROJECT_NAME");
      const char* cmakeBuildConfiguration
!       = this->Makefile->GetDefinition("CTEST_BUILD_CONFIGURATION");
      const char* cmakeBuildAdditionalFlags
!       = this->Makefile->GetDefinition("CTEST_BUILD_FLAGS");
      const char* cmakeBuildTarget
!       = this->Makefile->GetDefinition("CTEST_BUILD_TARGET");
      if ( cmakeGeneratorName && *cmakeGeneratorName &&
        cmakeProjectName && *cmakeProjectName )
--- 65,84 ----
        = this->Makefile->GetDefinition("CTEST_CMAKE_GENERATOR");
      const char* cmakeProjectName
!       = (this->Values[ctb_PROJECT_NAME] && *this->Values[ctb_PROJECT_NAME])
!       ? this->Values[ctb_PROJECT_NAME]
!       : this->Makefile->GetDefinition("CTEST_PROJECT_NAME");
      const char* cmakeBuildConfiguration
!       = (this->Values[ctb_CONFIGURATION] && *this->Values[ctb_CONFIGURATION])
!       ? this->Values[ctb_CONFIGURATION]
!       : this->Makefile->GetDefinition("CTEST_BUILD_CONFIGURATION");
      const char* cmakeBuildAdditionalFlags
!       = (this->Values[ctb_FLAGS] && *this->Values[ctb_FLAGS])
!       ? this->Values[ctb_FLAGS]
!       : this->Makefile->GetDefinition("CTEST_BUILD_FLAGS");
      const char* cmakeBuildTarget
!       = (this->Values[ctb_TARGET] && *this->Values[ctb_TARGET])
!       ? this->Values[ctb_TARGET]
!       : this->Makefile->GetDefinition("CTEST_BUILD_TARGET");
! 
      if ( cmakeGeneratorName && *cmakeGeneratorName &&
        cmakeProjectName && *cmakeProjectName )

Index: cmCTestBuildCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildCommand.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C 2 -d -r1.10 -r1.11
*** cmCTestBuildCommand.h	28 Sep 2009 15:42:57 -0000	1.10
--- cmCTestBuildCommand.h	3 Nov 2009 21:46:30 -0000	1.11
***************
*** 83,86 ****
--- 83,90 ----
      ctb_NUMBER_ERRORS,
      ctb_NUMBER_WARNINGS,
+     ctb_TARGET,
+     ctb_CONFIGURATION,
+     ctb_FLAGS,
+     ctb_PROJECT_NAME,
      ctb_LAST
    };