diff options
| author | David Cole <david.cole@kitware.com> | 2009-12-04 17:09:01 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2009-12-04 17:09:01 (GMT) |
| commit | 0b38bb4c535ae972d7f973e3e69945a6d0c14d75 (patch) | |
| tree | ac80395b194b2a8ed2bcf6b1f997b62c21d151be /Source/CTest/cmCTestBuildHandler.h | |
| parent | af14f1f2c3750ba3cf9b9cc1a809a88b1878a5c3 (diff) | |
| download | CMake-0b38bb4c535ae972d7f973e3e69945a6d0c14d75.zip CMake-0b38bb4c535ae972d7f973e3e69945a6d0c14d75.tar.gz CMake-0b38bb4c535ae972d7f973e3e69945a6d0c14d75.tar.bz2 | |
Fix issue #2336 - honor the -C arg to ctest. Honor it for all stages of running -D dashboards from the command line and running ctest_configure, ctest_build and ctest_test commands in -S scripts. Also, allow a script to change it by setting the CTEST_CONFIGURATION_TYPE variable: allows for multiple configuration build/test cycles within one script. Add a new signature for the cmake command build_command that accepts CONFIGURATION as one argument. The original build_command signature is still there, but now marked as deprecated in the documentation. Of course... also add CTestConfig tests to verify that -C is honored for -D dashboards and -S scripts.
Diffstat (limited to 'Source/CTest/cmCTestBuildHandler.h')
| -rw-r--r-- | Source/CTest/cmCTestBuildHandler.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestBuildHandler.h b/Source/CTest/cmCTestBuildHandler.h index 7ee50be..439efd6 100644 --- a/Source/CTest/cmCTestBuildHandler.h +++ b/Source/CTest/cmCTestBuildHandler.h @@ -46,7 +46,10 @@ public: int GetTotalErrors() { return this->TotalErrors;} int GetTotalWarnings() { return this->TotalWarnings;} + private: + std::string GetMakeCommand(); + //! Run command specialized for make and configure. Returns process status // and retVal is return value or exception. int RunMakeCommand(const char* command, |