diff options
| author | Brad King <brad.king@kitware.com> | 2020-12-11 18:05:12 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-12-11 18:05:34 (GMT) |
| commit | 23df57a3a75b26ec10439f7d1d34f2f3fff2bd23 (patch) | |
| tree | b638c70571ffd47fb22442cff911e191ddba14f0 /Help/manual | |
| parent | 0a5a883d53c74b42789bd51c2666f280b2be45c0 (diff) | |
| parent | b7f0327dcd4032c6a118825adcfdc8dab6295e7f (diff) | |
| download | CMake-23df57a3a75b26ec10439f7d1d34f2f3fff2bd23.zip CMake-23df57a3a75b26ec10439f7d1d34f2f3fff2bd23.tar.gz CMake-23df57a3a75b26ec10439f7d1d34f2f3fff2bd23.tar.bz2 | |
Merge topic 'apple-silicon-host-arch' into release-3.19
b7f0327dcd Tests: Cover macOS host architecture selection on Apple Silicon hosts
5f882f6ce5 macOS: Offer control over host architecture on Apple Silicon hosts
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5589
Diffstat (limited to 'Help/manual')
| -rw-r--r-- | Help/manual/cmake-env-variables.7.rst | 1 | ||||
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Help/manual/cmake-env-variables.7.rst b/Help/manual/cmake-env-variables.7.rst index 13e0d39..d9cfa7a 100644 --- a/Help/manual/cmake-env-variables.7.rst +++ b/Help/manual/cmake-env-variables.7.rst @@ -28,6 +28,7 @@ Environment Variables that Control the Build .. toctree:: :maxdepth: 1 + /envvar/CMAKE_APPLE_SILICON_PROCESSOR /envvar/CMAKE_BUILD_PARALLEL_LEVEL /envvar/CMAKE_CONFIG_TYPE /envvar/CMAKE_EXPORT_COMPILE_COMMANDS diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index ecf0fa4..3f0fb03 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -353,6 +353,7 @@ Variables that Control the Build /variable/CMAKE_ANDROID_SKIP_ANT_STEP /variable/CMAKE_ANDROID_STANDALONE_TOOLCHAIN /variable/CMAKE_ANDROID_STL_TYPE + /variable/CMAKE_APPLE_SILICON_PROCESSOR /variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY /variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY_CONFIG /variable/CMAKE_AUTOGEN_ORIGIN_DEPENDS |