Merge branch 'no-cmake-self-install-when-cross-compiling' into release
This commit is contained in:
commit
0d047e81f3
|
@ -2362,7 +2362,8 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
|
||||||
depends.push_back(this->GetAllTargetName());
|
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
|
// We are building CMake itself. We cannot use the original
|
||||||
// executable to install over itself. The generator will
|
// executable to install over itself. The generator will
|
||||||
|
|
Loading…
Reference in New Issue