diff options
| author | Brad King <brad.king@kitware.com> | 2013-03-28 14:05:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-04-12 15:35:36 (GMT) |
| commit | a6c0299c407bc4482140637c0460f71238b4f9d0 (patch) | |
| tree | 2aa0057e1e82368470e5bf0a50a33bcf93317101 /Source/CTest/cmCTestConfigureCommand.cxx | |
| parent | 1ca93182ad37f6f90ceb0b2a5faaa21ef58ba7e2 (diff) | |
| download | CMake-a6c0299c407bc4482140637c0460f71238b4f9d0.zip CMake-a6c0299c407bc4482140637c0460f71238b4f9d0.tar.gz CMake-a6c0299c407bc4482140637c0460f71238b4f9d0.tar.bz2 | |
CTest: Simplify ctest_* command source/build dir lookup
In cmCTestHandlerCommand::InitialPass call InitializeHandler after setting
the CTest "SourceDirectory" and "BuildDirectory" configuration values
instead of before. This makes the values available to InitializeHandler
methods in subclasses, so also drop the duplicate configuration of those
values from cmCTestConfigureCommand::InitializeHandler.
Diffstat (limited to 'Source/CTest/cmCTestConfigureCommand.cxx')
| -rw-r--r-- | Source/CTest/cmCTestConfigureCommand.cxx | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/Source/CTest/cmCTestConfigureCommand.cxx b/Source/CTest/cmCTestConfigureCommand.cxx index d6d39a9..db33cb6 100644 --- a/Source/CTest/cmCTestConfigureCommand.cxx +++ b/Source/CTest/cmCTestConfigureCommand.cxx @@ -31,32 +31,6 @@ cmCTestGenericHandler* cmCTestConfigureCommand::InitializeHandler() cmSystemTools::ExpandListArgument(this->Values[ctc_OPTIONS], options); } - if ( this->Values[ct_BUILD] ) - { - this->CTest->SetCTestConfiguration("BuildDirectory", - cmSystemTools::CollapseFullPath( - this->Values[ct_BUILD]).c_str()); - } - else - { - this->CTest->SetCTestConfiguration("BuildDirectory", - cmSystemTools::CollapseFullPath( - this->Makefile->GetSafeDefinition("CTEST_BINARY_DIRECTORY")).c_str()); - } - - if ( this->Values[ct_SOURCE] ) - { - this->CTest->SetCTestConfiguration("SourceDirectory", - cmSystemTools::CollapseFullPath( - this->Values[ct_SOURCE]).c_str()); - } - else - { - this->CTest->SetCTestConfiguration("SourceDirectory", - cmSystemTools::CollapseFullPath( - this->Makefile->GetSafeDefinition("CTEST_SOURCE_DIRECTORY")).c_str()); - } - if ( this->CTest->GetCTestConfiguration("BuildDirectory").empty() ) { this->SetError("Build directory not specified. Either use BUILD " |