瀏覽代碼

Merge topic 'no-cmake-self-install-when-cross-compiling'

15f55cca Do not use just-built CMake to install itself when cross-compiling (#15248)
Brad King 11 年之前
父節點
當前提交
810ef59a42
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      Source/cmGlobalGenerator.cxx

+ 2 - 1
Source/cmGlobalGenerator.cxx

@@ -2372,7 +2372,8 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
         depends.push_back(this->GetAllTargetName());
         }
       }
-    if(mf->GetDefinition("CMake_BINARY_DIR"))
+    if(mf->GetDefinition("CMake_BINARY_DIR") &&
+       !mf->IsOn("CMAKE_CROSSCOMPILING"))
       {
       // We are building CMake itself.  We cannot use the original
       // executable to install over itself.  The generator will