diff options
| author | Brad King <brad.king@kitware.com> | 2014-05-20 13:40:14 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-05-20 13:40:14 (GMT) |
| commit | c1edede31f4e979826a5fc0f6e56b1b59cb00f21 (patch) | |
| tree | 11ca8f038a7e363ebd7b218d5cf753fae4b1cd4d /Help/manual | |
| parent | 8897116df8e8a6576f2736b96b8e0d529c26139e (diff) | |
| parent | e0890d03a48d12904ffe24aa94fb2847d8d5f4e7 (diff) | |
| download | CMake-c1edede31f4e979826a5fc0f6e56b1b59cb00f21.zip CMake-c1edede31f4e979826a5fc0f6e56b1b59cb00f21.tar.gz CMake-c1edede31f4e979826a5fc0f6e56b1b59cb00f21.tar.bz2 | |
Merge topic 'compile-features-C-language'
e0890d03 Features: Extend concept to C language.
Diffstat (limited to 'Help/manual')
| -rw-r--r-- | Help/manual/cmake-properties.7.rst | 4 | ||||
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst index 3036a5f..52dfd02 100644 --- a/Help/manual/cmake-properties.7.rst +++ b/Help/manual/cmake-properties.7.rst @@ -16,6 +16,7 @@ Properties of Global Scope /prop_gbl/ALLOW_DUPLICATE_CUSTOM_TARGETS /prop_gbl/AUTOGEN_TARGETS_FOLDER /prop_gbl/AUTOMOC_TARGETS_FOLDER + /prop_gbl/CMAKE_C_KNOWN_FEATURES /prop_gbl/CMAKE_CXX_KNOWN_FEATURES /prop_gbl/DEBUG_CONFIGURATIONS /prop_gbl/DISABLED_FEATURES @@ -93,6 +94,9 @@ Properties on Targets /prop_tgt/BUILD_WITH_INSTALL_RPATH /prop_tgt/BUNDLE_EXTENSION /prop_tgt/BUNDLE + /prop_tgt/C_EXTENSIONS + /prop_tgt/C_STANDARD + /prop_tgt/C_STANDARD_REQUIRED /prop_tgt/COMPATIBLE_INTERFACE_BOOL /prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MAX /prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MIN diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index a7d4af6..b2dc88f 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -260,6 +260,10 @@ Variables for Languages :maxdepth: 1 /variable/CMAKE_COMPILER_IS_GNULANG + /variable/CMAKE_C_COMPILE_FEATURES + /variable/CMAKE_C_EXTENSIONS + /variable/CMAKE_C_STANDARD + /variable/CMAKE_C_STANDARD_REQUIRED /variable/CMAKE_CXX_COMPILE_FEATURES /variable/CMAKE_CXX_EXTENSIONS /variable/CMAKE_CXX_STANDARD |