diff options
author | Brad King <brad.king@kitware.com> | 2014-01-02 19:23:09 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-01-02 19:23:09 (GMT) |
commit | 0d63bdd2d9690cfdb43671af7465704675a68733 (patch) | |
tree | 17370b9ce679a48de0ed5f3baf7cddd27ed08e01 /Help/manual | |
parent | c0ea0604a0dcd1d580e9b6a976aae0069cab2986 (diff) | |
parent | d25ad482e978cbf5e4fcfa8b1dcc342ba93dcda0 (diff) | |
download | CMake-0d63bdd2d9690cfdb43671af7465704675a68733.zip CMake-0d63bdd2d9690cfdb43671af7465704675a68733.tar.gz CMake-0d63bdd2d9690cfdb43671af7465704675a68733.tar.bz2 |
Merge topic 'rpath-default'
d25ad48 OS X: Add CMP0042 to enable MACOSX_RPATH by default
Diffstat (limited to 'Help/manual')
-rw-r--r-- | Help/manual/cmake-policies.7.rst | 1 | ||||
-rw-r--r-- | Help/manual/cmake-variables.7.rst | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst index 9e26392..d467c36 100644 --- a/Help/manual/cmake-policies.7.rst +++ b/Help/manual/cmake-policies.7.rst @@ -89,3 +89,4 @@ All Policies /policy/CMP0039 /policy/CMP0040 /policy/CMP0041 + /policy/CMP0042 diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index d86db37..aebfe87 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -207,6 +207,7 @@ Variables that Control the Build /variable/CMAKE_LINK_LIBRARY_FILE_FLAG /variable/CMAKE_LINK_LIBRARY_FLAG /variable/CMAKE_MACOSX_BUNDLE + /variable/CMAKE_MACOSX_RPATH /variable/CMAKE_MAP_IMPORTED_CONFIG_CONFIG /variable/CMAKE_MODULE_LINKER_FLAGS_CONFIG /variable/CMAKE_MODULE_LINKER_FLAGS |