diff options
author | Bill Hoffman <bill.hoffman@kitware.com> | 2002-05-08 13:05:40 (GMT) |
---|---|---|
committer | Bill Hoffman <bill.hoffman@kitware.com> | 2002-05-08 13:05:40 (GMT) |
commit | 0caf44cb5d2f1e96391d8ed990fa9ae07fda563e (patch) | |
tree | 48d0cd9fa531be58578252ec31809dff029798bf /Source/cmake.cxx | |
parent | b076138e7d60089588d6add5f4784859494ecdf0 (diff) | |
download | CMake-0caf44cb5d2f1e96391d8ed990fa9ae07fda563e.zip CMake-0caf44cb5d2f1e96391d8ed990fa9ae07fda563e.tar.gz CMake-0caf44cb5d2f1e96391d8ed990fa9ae07fda563e.tar.bz2 |
ENH: fix cmake to work without ccommand.
Diffstat (limited to 'Source/cmake.cxx')
-rw-r--r-- | Source/cmake.cxx | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 95f62ea..c9a438c 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -254,18 +254,14 @@ void cmake::AddCMakePaths(const std::vector<std::string>& args) // Find ccommand std::string cCommand = cmSystemTools::GetFilenamePath(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 " - "ccommand. Attempted path: ", cCommand.c_str()); - return; + // Save the value in the cache + cmCacheManager::GetInstance()->AddCacheEntry + ("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 std::string editCacheCommand = cmSystemTools::GetFilenamePath(cMakeSelf) + "/ccmake" + cmSystemTools::GetFilenameExtension(cMakeSelf); |