https://github.com/Kitware/CMake
Revision 0110aa018d81a7b0f1f9371fcd038b71fefae554 authored by Craig Scott on 08 February 2021, 06:30:48 UTC, committed by Craig Scott on 08 February 2021, 07:02:46 UTC
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
1 parent f0257a8
Tip revision: 0110aa018d81a7b0f1f9371fcd038b71fefae554 authored by Craig Scott on 08 February 2021, 06:30:48 UTC
IOS_INSTALL_COMBINED: Support Xcode 12 (command line only)
IOS_INSTALL_COMBINED: Support Xcode 12 (command line only)
Tip revision: 0110aa0
| File | Mode | Size |
|---|---|---|
| .github | ||
| .gitlab | ||
| Auxiliary | ||
| Help | ||
| Licenses | ||
| Modules | ||
| Packaging | ||
| Source | ||
| Templates | ||
| Tests | ||
| Utilities | ||
| .clang-format | -rw-r--r-- | 1.4 KB |
| .clang-tidy | -rw-r--r-- | 1.5 KB |
| .gitattributes | -rw-r--r-- | 1.1 KB |
| .gitignore | -rw-r--r-- | 154 bytes |
| .gitlab-ci.yml | -rw-r--r-- | 7.3 KB |
| .hooks-config | -rw-r--r-- | 418 bytes |
| CMakeCPack.cmake | -rw-r--r-- | 9.7 KB |
| CMakeCPackOptions.cmake.in | -rw-r--r-- | 11.9 KB |
| CMakeGraphVizOptions.cmake | -rw-r--r-- | 153 bytes |
| CMakeLists.txt | -rw-r--r-- | 33.6 KB |
| CMakeLogo.gif | -rw-r--r-- | 4.4 KB |
| CONTRIBUTING.rst | -rw-r--r-- | 3.0 KB |
| CTestConfig.cmake | -rw-r--r-- | 566 bytes |
| CTestCustom.cmake.in | -rw-r--r-- | 7.1 KB |
| CompileFlags.cmake | -rw-r--r-- | 4.7 KB |
| Copyright.txt | -rw-r--r-- | 5.2 KB |
| DartConfig.cmake | -rw-r--r-- | 374 bytes |
| README.rst | -rw-r--r-- | 3.9 KB |
| bootstrap | -rwxr-xr-x | 61.3 KB |
| cmake_uninstall.cmake.in | -rw-r--r-- | 789 bytes |
| configure | -rwxr-xr-x | 99 bytes |
| doxygen.config | -rw-r--r-- | 27.4 KB |
Computing file changes ...
