diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-10 14:24:16 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-10 14:24:16 (GMT) |
| commit | 29d4f6b03b9ed9fc82e1ffa1e99b070b5dff3046 (patch) | |
| tree | ab6b6045d60255ea15a54ed8d1094be2826dd216 /Help | |
| parent | ebaa5a641026d01e58debedb92bd23322513e48c (diff) | |
| parent | 764e977ad7a881bc5144f09890b6bf50ac455cf4 (diff) | |
| download | CMake-29d4f6b03b9ed9fc82e1ffa1e99b070b5dff3046.zip CMake-29d4f6b03b9ed9fc82e1ffa1e99b070b5dff3046.tar.gz CMake-29d4f6b03b9ed9fc82e1ffa1e99b070b5dff3046.tar.bz2 | |
Merge branch 'doc-osx-path-variables' into release
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 2 | ||||
| -rw-r--r-- | Help/variable/CMAKE_APPBUNDLE_PATH.rst | 5 | ||||
| -rw-r--r-- | Help/variable/CMAKE_FRAMEWORK_PATH.rst | 6 |
3 files changed, 13 insertions, 0 deletions
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index c4ae193..d9d7a0c 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -99,6 +99,7 @@ Variables that Change Behavior /variable/BUILD_SHARED_LIBS /variable/CMAKE_ABSOLUTE_DESTINATION_FILES + /variable/CMAKE_APPBUNDLE_PATH /variable/CMAKE_AUTOMOC_RELAXED_MODE /variable/CMAKE_BACKWARDS_COMPATIBILITY /variable/CMAKE_BUILD_TYPE @@ -118,6 +119,7 @@ Variables that Change Behavior /variable/CMAKE_FIND_ROOT_PATH_MODE_LIBRARY /variable/CMAKE_FIND_ROOT_PATH_MODE_PACKAGE /variable/CMAKE_FIND_ROOT_PATH_MODE_PROGRAM + /variable/CMAKE_FRAMEWORK_PATH /variable/CMAKE_IGNORE_PATH /variable/CMAKE_INCLUDE_PATH /variable/CMAKE_INCLUDE_DIRECTORIES_BEFORE diff --git a/Help/variable/CMAKE_APPBUNDLE_PATH.rst b/Help/variable/CMAKE_APPBUNDLE_PATH.rst new file mode 100644 index 0000000..469b316 --- /dev/null +++ b/Help/variable/CMAKE_APPBUNDLE_PATH.rst @@ -0,0 +1,5 @@ +CMAKE_APPBUNDLE_PATH +-------------------- + +Search path for OS X application bundles used by the :command:`find_program`, +and :command:`find_package` commands. diff --git a/Help/variable/CMAKE_FRAMEWORK_PATH.rst b/Help/variable/CMAKE_FRAMEWORK_PATH.rst new file mode 100644 index 0000000..f1bc75e --- /dev/null +++ b/Help/variable/CMAKE_FRAMEWORK_PATH.rst @@ -0,0 +1,6 @@ +CMAKE_FRAMEWORK_PATH +-------------------- + +Search path for OS X frameworks used by the :command:`find_library`, +:command:`find_package`, :command:`find_path`, and :command:`find_file` +commands. |