diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-13 15:22:06 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-11-13 15:22:06 (GMT) |
| commit | 0d047e81f3fb06149f04ffc05d05da3204205985 (patch) | |
| tree | 2f18fb6106ec2e610eea4c5f0d4a1babeda13ac9 /Source | |
| parent | 4fba217dac49836f43cbb70258348de37f70da3e (diff) | |
| parent | 15f55cca5971c93b1b6c950b9b7ca5a398140957 (diff) | |
| download | CMake-0d047e81f3fb06149f04ffc05d05da3204205985.zip CMake-0d047e81f3fb06149f04ffc05d05da3204205985.tar.gz CMake-0d047e81f3fb06149f04ffc05d05da3204205985.tar.bz2 | |
Merge branch 'no-cmake-self-install-when-cross-compiling' into release
Diffstat (limited to 'Source')
| -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 ae0e807..2f4d9bb 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -2362,7 +2362,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 |