浏览代码

ENH: make install depend on all

Bill Hoffman 20 年之前
父节点
当前提交
2f50e43032
共有 1 个文件被更改,包括 9 次插入1 次删除
  1. 9 1
      Source/cmGlobalXCodeGenerator.cxx

+ 9 - 1
Source/cmGlobalXCodeGenerator.cxx

@@ -184,7 +184,15 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
   std::string cmake_command = mf->GetRequiredDefinition("CMAKE_COMMAND");
   std::string cmake_command = mf->GetRequiredDefinition("CMAKE_COMMAND");
   mf->AddUtilityCommand("install", false, no_output, no_depends,
   mf->AddUtilityCommand("install", false, no_output, no_depends,
                         cmake_command.c_str(),
                         cmake_command.c_str(),
-                        "-P", "cmake_install.cmake");
+                        "-P", "cmake_install.cmake"); 
+  const char* noall =
+    mf->GetDefinition("CMAKE_SKIP_INSTALL_ALL_DEPENDENCY");
+  if(!noall || cmSystemTools::IsOff(noall))
+    {
+    cmTarget* install = mf->FindTarget("install");
+    install->AddUtility("ALL_BUILD");
+    }
+  
   // Add RUN_TESTS target if testing has been enabled
   // Add RUN_TESTS target if testing has been enabled
   std::string fname;
   std::string fname;
   fname = mf->GetStartOutputDirectory();
   fname = mf->GetStartOutputDirectory();