浏览代码

BUG: Fixed check for existence of CMakeLists.txt file in top-level source directory before first configure.

Brad King 22 年之前
父节点
当前提交
abffd72cbb
共有 1 个文件被更改,包括 11 次插入11 次删除
  1. 11 11
      Source/cmake.cxx

+ 11 - 11
Source/cmake.cxx

@@ -786,6 +786,17 @@ void cmake::SetGlobalGenerator(cmGlobalGenerator *gg)
 
 int cmake::DoPreConfigureChecks()
 {
+  // Make sure the Start directory contains a CMakeLists.txt file.
+  std::string srcList = this->GetHomeDirectory();
+  srcList += "/CMakeLists.txt";
+  if(!cmSystemTools::FileExists(srcList.c_str()))
+    {
+    cmSystemTools::Error(
+      "The source directory does not appear to contain CMakeLists.txt.\n"
+      "Specify --help for usage.");
+    return -2;
+    }
+  
   // do a sanity check on some values
   if(m_CacheManager->GetCacheValue("CMAKE_HOME_DIRECTORY"))
     {
@@ -955,17 +966,6 @@ int cmake::Run(const std::vector<std::string>& args, bool noconfigure)
   // Process the arguments
   this->SetArgs(args);
   
-  // make sure rthe Start directory contains a CMakeLists.txt file
-  std::string srcList = this->GetHomeDirectory();
-  srcList += "/CMakeLists.txt";
-  if(!cmSystemTools::FileExists(srcList.c_str()))
-    {
-    cmSystemTools::Error(
-      "The source directory does not appear to contain CMakeLists.txt.\n"
-      "Specify --help for usage.");
-    return -1;
-    }
-  
   // set the cmake command
   m_CMakeCommand = args[0];