summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalGenerator.cxx
diff options
context:
space:
mode:
authorCraig Scott <craig.scott@crascit.com>2021-02-08 06:30:48 (GMT)
committerCraig Scott <craig.scott@crascit.com>2021-02-08 07:02:46 (GMT)
commit0110aa018d81a7b0f1f9371fcd038b71fefae554 (patch)
treeb6232f4855654052c2eba15f663154ec19dc2b55 /Source/cmLocalGenerator.cxx
parentf0257a87a3c282e2ea0c0a06556d4fedeb4cfe95 (diff)
downloadCMake-0110aa018d81a7b0f1f9371fcd038b71fefae554.zip
CMake-0110aa018d81a7b0f1f9371fcd038b71fefae554.tar.gz
CMake-0110aa018d81a7b0f1f9371fcd038b71fefae554.tar.bz2
IOS_INSTALL_COMBINED: Support Xcode 12 (command line only)
Xcode 12 doesn't allow nested builds within the same build directory. That means we can no longer do an install by building the install target when IOS_INSTALL_COMBINED is true. We can, however, still do an install by running the cmake_install.cmake script or executing cmake --install, since there is no outer build and therefore the associated SDK can be built as a sub-build. The non-build methods previously didn't work when IOS_INSTALL_COMBINED was true because the generated install script and the CMakeIOSInstallCombined script both made certain assumptions that relied on being part of a build. Those assumptions are now removed. A side-effect of this work is that cpack now also works from the command line when IOS_INSTALL_COMBINED is true. Relates: #21282 Fixes: #20023
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
-rw-r--r--Source/cmLocalGenerator.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 2239192..b5580e7 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -644,6 +644,8 @@ void cmLocalGenerator::GenerateInstallRules()
/* clang-format on */
}
+ this->AddGeneratorSpecificInstallSetup(fout);
+
// Ask each install generator to write its code.
cmPolicies::PolicyStatus status = this->GetPolicyStatus(cmPolicies::CMP0082);
auto const& installers = this->Makefile->GetInstallGenerators();