ENH: fix cmake to work without ccommand.
This commit is contained in:
parent
b076138e7d
commit
0caf44cb5d
|
@ -254,18 +254,14 @@ void cmake::AddCMakePaths(const std::vector<std::string>& args)
|
||||||
// Find ccommand
|
// Find ccommand
|
||||||
std::string cCommand = cmSystemTools::GetFilenamePath(cMakeSelf) +
|
std::string cCommand = cmSystemTools::GetFilenamePath(cMakeSelf) +
|
||||||
"/ccommand" + cmSystemTools::GetFilenameExtension(cMakeSelf);
|
"/ccommand" + cmSystemTools::GetFilenameExtension(cMakeSelf);
|
||||||
if( !cmSystemTools::FileExists(cCommand.c_str()))
|
if( cmSystemTools::FileExists(cCommand.c_str()))
|
||||||
{
|
{
|
||||||
cmSystemTools::Error("CMAKE can not find the command line program "
|
// Save the value in the cache
|
||||||
"ccommand. Attempted path: ", cCommand.c_str());
|
cmCacheManager::GetInstance()->AddCacheEntry
|
||||||
return;
|
("CCOMMAND_COMMAND",cCommand.c_str(),
|
||||||
|
"Path to CMakeCommand executable.", cmCacheManager::INTERNAL);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Save the value in the cache
|
|
||||||
cmCacheManager::GetInstance()->AddCacheEntry
|
|
||||||
("CCOMMAND_COMMAND",cCommand.c_str(),
|
|
||||||
"Path to CMakeCommand executable.", cmCacheManager::INTERNAL);
|
|
||||||
|
|
||||||
// Find and save the command to edit the cache
|
// Find and save the command to edit the cache
|
||||||
std::string editCacheCommand = cmSystemTools::GetFilenamePath(cMakeSelf) +
|
std::string editCacheCommand = cmSystemTools::GetFilenamePath(cMakeSelf) +
|
||||||
"/ccmake" + cmSystemTools::GetFilenameExtension(cMakeSelf);
|
"/ccmake" + cmSystemTools::GetFilenameExtension(cMakeSelf);
|
||||||
|
|
Loading…
Reference in New Issue