diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-02-24 13:57:05 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-02-24 13:57:05 (GMT) |
| commit | a488b192af5838ec1d3ed0bfa816fdd1be5e0b38 (patch) | |
| tree | 0d7f8c9c0f6f6168531fbde35490e4239224d852 | |
| parent | 32aece7ad49fd7f22f990385ce7c15558d175293 (diff) | |
| download | CMake-a488b192af5838ec1d3ed0bfa816fdd1be5e0b38.zip CMake-a488b192af5838ec1d3ed0bfa816fdd1be5e0b38.tar.gz CMake-a488b192af5838ec1d3ed0bfa816fdd1be5e0b38.tar.bz2 | |
BUG: Fix location of ctest for bootstrap
| -rw-r--r-- | Source/cmake.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index d8733c1..42a2d2d 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1897,6 +1897,7 @@ const char* cmake::GetCTestCommand() } cmMakefile* mf = this->GetGlobalGenerator()->GetLocalGenerator(0)->GetMakefile(); +#ifdef CMAKE_BUILD_WITH_CMAKE m_CTestCommand = mf->GetRequiredDefinition("CMAKE_COMMAND"); m_CTestCommand = removeQuotes(m_CTestCommand); m_CTestCommand = cmSystemTools::GetFilenamePath(m_CTestCommand.c_str()); @@ -1919,6 +1920,12 @@ const char* cmake::GetCTestCommand() m_CTestCommand += "ctest"; m_CTestCommand += cmSystemTools::GetExecutableExtension(); } +#else + // Only for bootstrap + m_CTestCommand += mf->GetSafeDefinition("EXECUTABLE_OUTPUT_PATH"); + m_CTestCommand += "/ctest"; + m_CTestCommand += cmSystemTools::GetExecutableExtension(); +#endif if ( m_CTestCommand.empty() ) { cmSystemTools::Error("Cannot find the CTest executable"); |