diff options
| author | Brad King <brad.king@kitware.com> | 2019-04-01 14:48:52 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-04-01 14:49:02 (GMT) |
| commit | 3e129d71bc12a325c0548aaaea24470cd172470b (patch) | |
| tree | d084c28fcf436d2529807f81ca31711b0384cbbe /Help/command | |
| parent | 29802ed27227fe91be1d531d6e894e4efbbb3d11 (diff) | |
| parent | 7d19b3091d7d2982a0d6b2b4408011efbb56f167 (diff) | |
| download | CMake-3e129d71bc12a325c0548aaaea24470cd172470b.zip CMake-3e129d71bc12a325c0548aaaea24470cd172470b.tar.gz CMake-3e129d71bc12a325c0548aaaea24470cd172470b.tar.bz2 | |
Merge topic 'project-include'
7d19b3091d Release note for CMAKE_PROJECT_INCLUDE variable
dda0190458 project: Add variable CMAKE_PROJECT_INCLUDE
390f14a244 Test ProjectInclude: Add NONE to avoid enabling languages
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3155
Diffstat (limited to 'Help/command')
| -rw-r--r-- | Help/command/project.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Help/command/project.rst b/Help/command/project.rst index 688e56c..a95012d 100644 --- a/Help/command/project.rst +++ b/Help/command/project.rst @@ -31,9 +31,9 @@ Further variables are set by the optional arguments described in the following. If any of these arguments is not used, then the corresponding variables are set to the empty string. -If the variable :variable:`CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE` exists, -the file pointed to by that variable will be included as the last step of the -project command. +If the variable :variable:`CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE` +or :variable:`CMAKE_PROJECT_INCLUDE` exists, the file pointed to by that +variable will be included as the last step of the project command. Options ^^^^^^^ |