diff options
| author | Craig Scott <craig.scott@crascit.com> | 2020-03-12 10:52:02 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-12 10:52:11 (GMT) |
| commit | 3d388e5e986b7053d25cd319400e1e21410cf9c3 (patch) | |
| tree | 9f5a64f765cf3544113d0e7c0e4238d8be34efd1 /Help/manual | |
| parent | dd45b7b429ee70adfbaa522e42b9e51afcd1522d (diff) | |
| parent | 14732d3f3013479440af0e702b3c82c490365a64 (diff) | |
| download | CMake-3d388e5e986b7053d25cd319400e1e21410cf9c3.zip CMake-3d388e5e986b7053d25cd319400e1e21410cf9c3.tar.gz CMake-3d388e5e986b7053d25cd319400e1e21410cf9c3.tar.bz2 | |
Merge topic 'rename-macho-version-properties' into release-3.17
14732d3f30 macOS: Rename OSX_*_VERSION properties to MACHO_*_VERSION
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4452
Diffstat (limited to 'Help/manual')
| -rw-r--r-- | Help/manual/cmake-properties.7.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst index a5342c6..060a072 100644 --- a/Help/manual/cmake-properties.7.rst +++ b/Help/manual/cmake-properties.7.rst @@ -285,6 +285,8 @@ Properties on Targets /prop_tgt/LINK_WHAT_YOU_USE /prop_tgt/LOCATION_CONFIG /prop_tgt/LOCATION + /prop_tgt/MACHO_COMPATIBILITY_VERSION + /prop_tgt/MACHO_CURRENT_VERSION /prop_tgt/MACOSX_BUNDLE_INFO_PLIST /prop_tgt/MACOSX_BUNDLE /prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST @@ -303,8 +305,6 @@ Properties on Targets /prop_tgt/OBJCXX_STANDARD_REQUIRED /prop_tgt/OSX_ARCHITECTURES_CONFIG /prop_tgt/OSX_ARCHITECTURES - /prop_tgt/OSX_CURRENT_VERSION - /prop_tgt/OSX_COMPATIBILITY_VERSION /prop_tgt/OUTPUT_NAME_CONFIG /prop_tgt/OUTPUT_NAME /prop_tgt/PDB_NAME_CONFIG |