From a488b192af5838ec1d3ed0bfa816fdd1be5e0b38 Mon Sep 17 00:00:00 2001 From: Andy Cedilnik Date: Fri, 24 Feb 2006 08:57:05 -0500 Subject: [PATCH] BUG: Fix location of ctest for bootstrap --- Source/cmake.cxx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Source/cmake.cxx b/Source/cmake.cxx index d8733c1fc..42a2d2d6d 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");