Commit a488b192 authored by Andy Cedilnik's avatar Andy Cedilnik
Browse files

BUG: Fix location of ctest for bootstrap

parent 32aece7a
......@@ -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");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment