Преглед изворни кода

ENH: fix cmake to work without ccommand.

Bill Hoffman пре 23 година
родитељ
комит
0caf44cb5d
1 измењених фајлова са 5 додато и 9 уклоњено
  1. 5 9
      Source/cmake.cxx

+ 5 - 9
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);