Explorar o código

Merge topic 'doc-osx-path-variables'

764e977a Help: Document variables CMAKE_APPBUNDLE_PATH and CMAKE_FRAMEWORK_PATH
Brad King %!s(int64=11) %!d(string=hai) anos
pai
achega
e21ffaf8fe

+ 2 - 0
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

+ 5 - 0
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.

+ 6 - 0
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.