kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Fix location of ctest for bootstrap

This commit is contained in:
Andy Cedilnik 2006-02-24 08:57:05 -05:00
parent 32aece7ad4
commit a488b192af
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmake.cxx
View File

@ -1897,6 +1897,7 @@ const char* cmake::GetCTestCommand()
} }
cmMakefile* mf = this->GetGlobalGenerator()->GetLocalGenerator(0)->GetMakefile(); cmMakefile* mf = this->GetGlobalGenerator()->GetLocalGenerator(0)->GetMakefile();
#ifdef CMAKE_BUILD_WITH_CMAKE
m_CTestCommand = mf->GetRequiredDefinition("CMAKE_COMMAND"); m_CTestCommand = mf->GetRequiredDefinition("CMAKE_COMMAND");
m_CTestCommand = removeQuotes(m_CTestCommand); m_CTestCommand = removeQuotes(m_CTestCommand);
m_CTestCommand = cmSystemTools::GetFilenamePath(m_CTestCommand.c_str()); m_CTestCommand = cmSystemTools::GetFilenamePath(m_CTestCommand.c_str());
@ -1919,6 +1920,12 @@ const char* cmake::GetCTestCommand()
m_CTestCommand += "ctest"; m_CTestCommand += "ctest";
m_CTestCommand += cmSystemTools::GetExecutableExtension(); 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() ) if ( m_CTestCommand.empty() )
{ {
cmSystemTools::Error("Cannot find the CTest executable"); cmSystemTools::Error("Cannot find the CTest executable");