diff options
| author | Brad King <brad.king@kitware.com> | 2019-11-12 14:47:35 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-11-12 14:47:44 (GMT) |
| commit | 88e0dca40df9c88e7d9b9d352fe19f63091bc7c3 (patch) | |
| tree | 3d1ff2d0e12eb15a11f04980c949a0d0c84b29c6 /Help/manual | |
| parent | b197d20c083da1cbfd32e79c4a4c8f36de3a6aae (diff) | |
| parent | 665954fa8d2d2e0a74aab78b7d739c0feae5211b (diff) | |
| download | CMake-88e0dca40df9c88e7d9b9d352fe19f63091bc7c3.zip CMake-88e0dca40df9c88e7d9b9d352fe19f63091bc7c3.tar.gz CMake-88e0dca40df9c88e7d9b9d352fe19f63091bc7c3.tar.bz2 | |
Merge topic 'objc-standard-docs' into release-3.16
665954fa8d ObjC: Document ObjC/ObjCXX standard properties / variables
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4031
Diffstat (limited to 'Help/manual')
| -rw-r--r-- | Help/manual/cmake-properties.7.rst | 6 | ||||
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst index a59dd6b..e704371 100644 --- a/Help/manual/cmake-properties.7.rst +++ b/Help/manual/cmake-properties.7.rst @@ -289,6 +289,12 @@ Properties on Targets /prop_tgt/NAME /prop_tgt/NO_SONAME /prop_tgt/NO_SYSTEM_FROM_IMPORTED + /prop_tgt/OBJC_EXTENSIONS + /prop_tgt/OBJC_STANDARD + /prop_tgt/OBJC_STANDARD_REQUIRED + /prop_tgt/OBJCXX_EXTENSIONS + /prop_tgt/OBJCXX_STANDARD + /prop_tgt/OBJCXX_STANDARD_REQUIRED /prop_tgt/OSX_ARCHITECTURES_CONFIG /prop_tgt/OSX_ARCHITECTURES /prop_tgt/OUTPUT_NAME_CONFIG diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 360140c..53b7f8d 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -529,6 +529,12 @@ Variables for Languages /variable/CMAKE_LANG_SOURCE_FILE_EXTENSIONS /variable/CMAKE_LANG_STANDARD_INCLUDE_DIRECTORIES /variable/CMAKE_LANG_STANDARD_LIBRARIES + /variable/CMAKE_OBJC_EXTENSIONS + /variable/CMAKE_OBJC_STANDARD + /variable/CMAKE_OBJC_STANDARD_REQUIRED + /variable/CMAKE_OBJCXX_EXTENSIONS + /variable/CMAKE_OBJCXX_STANDARD + /variable/CMAKE_OBJCXX_STANDARD_REQUIRED /variable/CMAKE_Swift_LANGUAGE_VERSION /variable/CMAKE_USER_MAKE_RULES_OVERRIDE_LANG |