diff options
| author | Brad King <brad.king@kitware.com> | 2024-08-26 13:48:20 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-08-26 13:48:40 (GMT) |
| commit | fe63f15383fec54f08eb469a26a23aaa2b10d403 (patch) | |
| tree | ab2d39c0da4d1298718275d3d6f2520d1ab90f41 /Help/manual | |
| parent | b448d7cc3a21f3ddb4e06f3784fbd68bd95972d7 (diff) | |
| parent | 1df94443fe5a24e43325b95d93043e8bf5565fa2 (diff) | |
| download | CMake-fe63f15383fec54f08eb469a26a23aaa2b10d403.zip CMake-fe63f15383fec54f08eb469a26a23aaa2b10d403.tar.gz CMake-fe63f15383fec54f08eb469a26a23aaa2b10d403.tar.bz2 | |
Merge topic 'fileapi-config-dir'
1df94443fe fileapi: Add support for user-wide queries
a991a5019b Tests: Isolate test suite from user-wide configuration
320b81847d Tests: Remove unused cvs anonymous access credentials
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9744
Diffstat (limited to 'Help/manual')
| -rw-r--r-- | Help/manual/cmake-env-variables.7.rst | 3 | ||||
| -rw-r--r-- | Help/manual/cmake-file-api.7.rst | 4 | ||||
| -rw-r--r-- | Help/manual/cmake.1.rst | 8 |
3 files changed, 14 insertions, 1 deletions
diff --git a/Help/manual/cmake-env-variables.7.rst b/Help/manual/cmake-env-variables.7.rst index 68ee79a..b2ceeae 100644 --- a/Help/manual/cmake-env-variables.7.rst +++ b/Help/manual/cmake-env-variables.7.rst @@ -43,8 +43,9 @@ Environment Variables that Control the Build /envvar/CMAKE_BUILD_PARALLEL_LEVEL /envvar/CMAKE_BUILD_TYPE /envvar/CMAKE_COLOR_DIAGNOSTICS - /envvar/CMAKE_CONFIGURATION_TYPES + /envvar/CMAKE_CONFIG_DIR /envvar/CMAKE_CONFIG_TYPE + /envvar/CMAKE_CONFIGURATION_TYPES /envvar/CMAKE_CROSSCOMPILING_EMULATOR /envvar/CMAKE_EXPORT_COMPILE_COMMANDS /envvar/CMAKE_GENERATOR diff --git a/Help/manual/cmake-file-api.7.rst b/Help/manual/cmake-file-api.7.rst index 260030e..a4ce5de 100644 --- a/Help/manual/cmake-file-api.7.rst +++ b/Help/manual/cmake-file-api.7.rst @@ -50,6 +50,10 @@ It has the following subdirectories: Clients may optionally create the ``reply/`` directory at any time and monitor it for the appearance of a new reply index file. +.. versionadded:: 3.31 + Users can add query files to ``api/v1/query`` inside the + :envvar:`CMAKE_CONFIG_DIR` to create user-wide queries for all CMake projects. + v1 Shared Stateless Query Files ------------------------------- diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst index 794ef96..586a72e 100644 --- a/Help/manual/cmake.1.rst +++ b/Help/manual/cmake.1.rst @@ -266,6 +266,14 @@ Options from the top of a binary tree for a CMake project it will dump additional information such as the cache, log files etc. +.. option:: --print-config-dir + + .. versionadded:: 3.31 + + Print CMake config directory for user-wide FileAPI queries. + + See :envvar:`CMAKE_CONFIG_DIR` for more details. + .. option:: --log-level=<level> .. versionadded:: 3.16 |