diff options
| author | Brad King <brad.king@kitware.com> | 2016-05-25 13:34:24 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-05-25 13:34:24 (GMT) |
| commit | 916d52533ea354d8945c0cba44f65ee34d0e7cd5 (patch) | |
| tree | 542f15a19985aea192718b20c44bf04782a4140a /Help | |
| parent | 8cd007fee664e4c7d1e3a1e50dba5b3fe973e3cf (diff) | |
| parent | c13408279f035c8261b530e26040cf4b8f01fdab (diff) | |
| download | CMake-916d52533ea354d8945c0cba44f65ee34d0e7cd5.zip CMake-916d52533ea354d8945c0cba44f65ee34d0e7cd5.tar.gz CMake-916d52533ea354d8945c0cba44f65ee34d0e7cd5.tar.bz2 | |
Merge topic 'standard-include-directories'
c1340827 Add a variable to specify language-wide system include directories
44199097 cmMakefile: Optimize AddSystemIncludeDirectories for empty set
a896043b GHS: Compute include directories consistently with other generators
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 1 | ||||
| -rw-r--r-- | Help/release/dev/standard-include-directories.rst | 6 | ||||
| -rw-r--r-- | Help/variable/CMAKE_LANG_STANDARD_INCLUDE_DIRECTORIES.rst | 14 | ||||
| -rw-r--r-- | Help/variable/CMAKE_LANG_STANDARD_LIBRARIES.rst | 2 |
4 files changed, 23 insertions, 0 deletions
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 925b70c..b8c8bea 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -365,6 +365,7 @@ Variables for Languages /variable/CMAKE_LANG_SIMULATE_VERSION /variable/CMAKE_LANG_SIZEOF_DATA_PTR /variable/CMAKE_LANG_SOURCE_FILE_EXTENSIONS + /variable/CMAKE_LANG_STANDARD_INCLUDE_DIRECTORIES /variable/CMAKE_LANG_STANDARD_LIBRARIES /variable/CMAKE_USER_MAKE_RULES_OVERRIDE_LANG diff --git a/Help/release/dev/standard-include-directories.rst b/Help/release/dev/standard-include-directories.rst new file mode 100644 index 0000000..a03d7db --- /dev/null +++ b/Help/release/dev/standard-include-directories.rst @@ -0,0 +1,6 @@ +standard-include-directories +---------------------------- + +* A :variable:`CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES` variable was + added for use by toolchain files to specify system include directories + to be appended to all compiler command lines. diff --git a/Help/variable/CMAKE_LANG_STANDARD_INCLUDE_DIRECTORIES.rst b/Help/variable/CMAKE_LANG_STANDARD_INCLUDE_DIRECTORIES.rst new file mode 100644 index 0000000..c8e3d57 --- /dev/null +++ b/Help/variable/CMAKE_LANG_STANDARD_INCLUDE_DIRECTORIES.rst @@ -0,0 +1,14 @@ +CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES +----------------------------------------- + +Include directories to be used for every source file compiled with +the ``<LANG>`` compiler. This is meant for specification of system +include directories needed by the language for the current platform. +The directories always appear at the end of the include path passed +to the compiler. + +This variable should not be set by project code. It is meant to be set by +CMake's platform information modules for the current toolchain, or by a +toolchain file when used with :variable:`CMAKE_TOOLCHAIN_FILE`. + +See also :variable:`CMAKE_<LANG>_STANDARD_LIBRARIES`. diff --git a/Help/variable/CMAKE_LANG_STANDARD_LIBRARIES.rst b/Help/variable/CMAKE_LANG_STANDARD_LIBRARIES.rst index ad3b911..ba6df93 100644 --- a/Help/variable/CMAKE_LANG_STANDARD_LIBRARIES.rst +++ b/Help/variable/CMAKE_LANG_STANDARD_LIBRARIES.rst @@ -8,3 +8,5 @@ libraries needed by the language for the current platform. This variable should not be set by project code. It is meant to be set by CMake's platform information modules for the current toolchain, or by a toolchain file when used with :variable:`CMAKE_TOOLCHAIN_FILE`. + +See also :variable:`CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES`. |