diff options
| author | Brad King <brad.king@kitware.com> | 2019-08-27 15:23:03 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-08-27 11:23:22 -0400 |
| commit | 843ab7544e319597306a6d9cea4ab8be3296e6c4 (patch) | |
| tree | 62262c4ccae447a0838c50a50db76c8baf9b9c37 /Help | |
| parent | 57fc6c587ad766135f9f2b62a870374e9251281c (diff) | |
| parent | 4ca0526f8a78e7abbd08e9978d4110f836ccef9b (diff) | |
| download | cmake-843ab7544e319597306a6d9cea4ab8be3296e6c4.tar.gz | |
Merge topic 'cmake-initial-cache-dirs'
4ca0526f8a cmake: Pass -S and -B into PreLoad.cmake and -C scripts
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3709
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/OPTIONS_BUILD.txt | 3 | ||||
| -rw-r--r-- | Help/release/dev/cmake-initial-cache-dirs.rst | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Help/manual/OPTIONS_BUILD.txt b/Help/manual/OPTIONS_BUILD.txt index 810aaa914c..0947e41cbf 100644 --- a/Help/manual/OPTIONS_BUILD.txt +++ b/Help/manual/OPTIONS_BUILD.txt @@ -18,6 +18,9 @@ containing :command:`set` commands that use the ``CACHE`` option, not a cache-format file. + References to :variable:`CMAKE_SOURCE_DIR` and :variable:`CMAKE_BINARY_DIR` + within the script evaluate to the top-level source and build tree. + ``-D <var>:<type>=<value>, -D <var>=<value>`` Create or update a CMake ``CACHE`` entry. diff --git a/Help/release/dev/cmake-initial-cache-dirs.rst b/Help/release/dev/cmake-initial-cache-dirs.rst new file mode 100644 index 0000000000..be9190212b --- /dev/null +++ b/Help/release/dev/cmake-initial-cache-dirs.rst @@ -0,0 +1,6 @@ +cmake-initial-cache-dirs +------------------------ + +* The :manual:`cmake(1)` ``-C <initial-cache>`` option now evaluates the + initial cache script with :variable:`CMAKE_SOURCE_DIR` and + :variable:`CMAKE_BINARY_DIR` set to the top-level source and build trees. |