diff options
| author | Brad King <brad.king@kitware.com> | 2019-05-22 14:30:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-05-22 14:32:43 (GMT) |
| commit | 8ed6efbbd377c0941ba018200282fc961aa7d20e (patch) | |
| tree | cf5f8c2f55359033068eb3206b8f1887c4b43bdd /Help/manual | |
| parent | fc4cbbc2a5f9f7d38e77c991a88400b29c39f182 (diff) | |
| parent | d0f0ba0f7a39e70fbed197e717292b74150cf84f (diff) | |
| download | CMake-8ed6efbbd377c0941ba018200282fc961aa7d20e.zip CMake-8ed6efbbd377c0941ba018200282fc961aa7d20e.tar.gz CMake-8ed6efbbd377c0941ba018200282fc961aa7d20e.tar.bz2 | |
Merge topic 'default-generator-env'
d0f0ba0f7a Tests: Add environment generator tests
a48ce8f4bf Help: Add documentation for default generator environment variables
083cf7e8a2 cmake: Allow default generator to be set by environment variables
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3218
Diffstat (limited to 'Help/manual')
| -rw-r--r-- | Help/manual/OPTIONS_BUILD.txt | 3 | ||||
| -rw-r--r-- | Help/manual/cmake-env-variables.7.rst | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Help/manual/OPTIONS_BUILD.txt b/Help/manual/OPTIONS_BUILD.txt index 64fd816..810aaa9 100644 --- a/Help/manual/OPTIONS_BUILD.txt +++ b/Help/manual/OPTIONS_BUILD.txt @@ -56,6 +56,9 @@ build system. Possible generator names are specified in the :manual:`cmake-generators(7)` manual. + If not specified, CMake checks the :envvar:`CMAKE_GENERATOR` environment + variable and otherwise falls back to a builtin default selection. + ``-T <toolset-spec>`` Toolset specification for the generator, if supported. diff --git a/Help/manual/cmake-env-variables.7.rst b/Help/manual/cmake-env-variables.7.rst index f106f28..96ceb94 100644 --- a/Help/manual/cmake-env-variables.7.rst +++ b/Help/manual/cmake-env-variables.7.rst @@ -23,6 +23,10 @@ Environment Variables that Control the Build /envvar/CMAKE_BUILD_PARALLEL_LEVEL /envvar/CMAKE_CONFIG_TYPE + /envvar/CMAKE_GENERATOR + /envvar/CMAKE_GENERATOR_INSTANCE + /envvar/CMAKE_GENERATOR_PLATFORM + /envvar/CMAKE_GENERATOR_TOOLSET /envvar/CMAKE_MSVCIDE_RUN_PATH /envvar/CMAKE_NO_VERBOSE /envvar/CMAKE_OSX_ARCHITECTURES |