diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-14 15:56:39 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-11-14 15:56:39 (GMT) |
| commit | 810ef59a423704bea0804ef97c5ce5c420b38025 (patch) | |
| tree | 7178ab88704c2655ee4ed1b686f57d8a14556f9c /Source/cmGlobalGenerator.cxx | |
| parent | 2531c0aa09522c7f6c07bcdc33d0dc8e778a219d (diff) | |
| parent | 15f55cca5971c93b1b6c950b9b7ca5a398140957 (diff) | |
| download | CMake-810ef59a423704bea0804ef97c5ce5c420b38025.zip CMake-810ef59a423704bea0804ef97c5ce5c420b38025.tar.gz CMake-810ef59a423704bea0804ef97c5ce5c420b38025.tar.bz2 | |
Merge topic 'no-cmake-self-install-when-cross-compiling'
15f55cca Do not use just-built CMake to install itself when cross-compiling (#15248)
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index ab9dc88..5a3c238 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/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 |