浏览代码

Merge topic 'doc-3_19_release-fixes' into release-3.19

ff4d1d44f2 Help: Clarify scope details of deferred call ids for cmake_language()
b4c02a0a1d Help: Re-sort indexes in the manuals
2c33949c64 Help: Mention how OPTIMIZE_DEPENDENCIES is initialized
0816482302 Help: xref variable that cmake_minimum_required() sets

Acked-by: Kitware Robot <[email protected]>
Merge-request: !5598
Brad King 5 年之前
父节点
当前提交
0a5a883d53

+ 12 - 5
Help/command/cmake_language.rst

@@ -150,7 +150,12 @@ The currently scheduled list of deferred calls may be retrieved:
   cmake_language(DEFER [DIRECTORY <dir>] GET_CALL_IDS <var>)
   cmake_language(DEFER [DIRECTORY <dir>] GET_CALL_IDS <var>)
 
 
 This will store in ``<var>`` a :ref:`semicolon-separated list <CMake Language
 This will store in ``<var>`` a :ref:`semicolon-separated list <CMake Language
-Lists>` of deferred call ids.
+Lists>` of deferred call ids.  The ids are for the directory scope in which
+the calls have been deferred to (i.e. where they will be executed), which can
+be different to the scope in which they were created.  The ``DIRECTORY``
+option can be used to specify the scope for which to retrieve the call ids.
+If that option is not given, the call ids for the current directory scope will
+be returned.
 
 
 Details of a specific call may be retrieved from its id:
 Details of a specific call may be retrieved from its id:
 
 
@@ -163,8 +168,9 @@ Lists>` in which the first element is the name of the command to be
 called, and the remaining elements are its unevaluated arguments (any
 called, and the remaining elements are its unevaluated arguments (any
 contained ``;`` characters are included literally and cannot be distinguished
 contained ``;`` characters are included literally and cannot be distinguished
 from multiple arguments).  If multiple calls are scheduled with the same id,
 from multiple arguments).  If multiple calls are scheduled with the same id,
-this retrieves the first one.  If no call is scheduled with the given id,
-this stores an empty string in the variable.
+this retrieves the first one.  If no call is scheduled with the given id in
+the specified ``DIRECTORY`` scope (or the current directory scope if no
+``DIRECTORY`` option is given), this stores an empty string in the variable.
 
 
 Deferred calls may be canceled by their id:
 Deferred calls may be canceled by their id:
 
 
@@ -172,8 +178,9 @@ Deferred calls may be canceled by their id:
 
 
   cmake_language(DEFER [DIRECTORY <dir>] CANCEL_CALL <id>...)
   cmake_language(DEFER [DIRECTORY <dir>] CANCEL_CALL <id>...)
 
 
-This cancels all deferred calls matching any of the given ids.
-Unknown ids are silently ignored.
+This cancels all deferred calls matching any of the given ids in the specified
+``DIRECTORY`` scope (or the current directory scope if no ``DIRECTORY`` option
+is given).  Unknown ids are silently ignored.
 
 
 Deferred Call Examples
 Deferred Call Examples
 """"""""""""""""""""""
 """"""""""""""""""""""

+ 3 - 0
Help/command/cmake_minimum_required.rst

@@ -22,6 +22,9 @@ dots will be seen as version component separators, resulting in the
 ``...<max>`` part being ignored and preserving the pre-3.12 behavior
 ``...<max>`` part being ignored and preserving the pre-3.12 behavior
 of basing policies on ``<min>``.
 of basing policies on ``<min>``.
 
 
+This command will set the value of the
+:variable:`CMAKE_MINIMUM_REQUIRED_VERSION` variable to ``<min>``.
+
 The ``FATAL_ERROR`` option is accepted but ignored by CMake 2.6 and
 The ``FATAL_ERROR`` option is accepted but ignored by CMake 2.6 and
 higher.  It should be specified so CMake versions 2.4 and lower fail
 higher.  It should be specified so CMake versions 2.4 and lower fail
 with an error instead of just a warning.
 with an error instead of just a warning.

+ 17 - 17
Help/manual/cmake-modules.7.rst

@@ -19,6 +19,7 @@ These modules are loaded using the :command:`include` command.
    /module/AndroidTestUtilities
    /module/AndroidTestUtilities
    /module/BundleUtilities
    /module/BundleUtilities
    /module/CheckCCompilerFlag
    /module/CheckCCompilerFlag
+   /module/CheckCompilerFlag
    /module/CheckCSourceCompiles
    /module/CheckCSourceCompiles
    /module/CheckCSourceRuns
    /module/CheckCSourceRuns
    /module/CheckCXXCompilerFlag
    /module/CheckCXXCompilerFlag
@@ -30,10 +31,10 @@ These modules are loaded using the :command:`include` command.
    /module/CheckFortranSourceCompiles
    /module/CheckFortranSourceCompiles
    /module/CheckFortranSourceRuns
    /module/CheckFortranSourceRuns
    /module/CheckFunctionExists
    /module/CheckFunctionExists
-   /module/CheckIPOSupported
    /module/CheckIncludeFileCXX
    /module/CheckIncludeFileCXX
    /module/CheckIncludeFile
    /module/CheckIncludeFile
    /module/CheckIncludeFiles
    /module/CheckIncludeFiles
+   /module/CheckIPOSupported
    /module/CheckLanguage
    /module/CheckLanguage
    /module/CheckLibraryExists
    /module/CheckLibraryExists
    /module/CheckLinkerFlag
    /module/CheckLinkerFlag
@@ -45,7 +46,6 @@ These modules are loaded using the :command:`include` command.
    /module/CheckOBJCXXSourceRuns
    /module/CheckOBJCXXSourceRuns
    /module/CheckPIESupported
    /module/CheckPIESupported
    /module/CheckPrototypeDefinition
    /module/CheckPrototypeDefinition
-   /module/CheckCompilerFlag
    /module/CheckSourceCompiles
    /module/CheckSourceCompiles
    /module/CheckSourceRuns
    /module/CheckSourceRuns
    /module/CheckStructHasMember
    /module/CheckStructHasMember
@@ -64,10 +64,10 @@ These modules are loaded using the :command:`include` command.
    /module/CMakePrintSystemInformation
    /module/CMakePrintSystemInformation
    /module/CMakePushCheckState
    /module/CMakePushCheckState
    /module/CMakeVerifyManifest
    /module/CMakeVerifyManifest
+   /module/CPack
    /module/CPackComponent
    /module/CPackComponent
    /module/CPackIFW
    /module/CPackIFW
    /module/CPackIFWConfigureFile
    /module/CPackIFWConfigureFile
-   /module/CPack
    /module/CSharpUtilities
    /module/CSharpUtilities
    /module/CTest
    /module/CTest
    /module/CTestCoverageCollectGCOV
    /module/CTestCoverageCollectGCOV
@@ -97,8 +97,8 @@ These modules are loaded using the :command:`include` command.
    /module/TestForSSTREAM
    /module/TestForSSTREAM
    /module/TestForSTDNamespace
    /module/TestForSTDNamespace
    /module/UseEcos
    /module/UseEcos
-   /module/UseJavaClassFilelist
    /module/UseJava
    /module/UseJava
+   /module/UseJavaClassFilelist
    /module/UseJavaSymlinks
    /module/UseJavaSymlinks
    /module/UseSWIG
    /module/UseSWIG
    /module/UsewxWidgets
    /module/UsewxWidgets
@@ -117,16 +117,16 @@ They are normally called through the :command:`find_package` command.
    /module/FindArmadillo
    /module/FindArmadillo
    /module/FindASPELL
    /module/FindASPELL
    /module/FindAVIFile
    /module/FindAVIFile
+   /module/FindBacktrace
    /module/FindBISON
    /module/FindBISON
    /module/FindBLAS
    /module/FindBLAS
-   /module/FindBacktrace
    /module/FindBoost
    /module/FindBoost
    /module/FindBullet
    /module/FindBullet
    /module/FindBZip2
    /module/FindBZip2
    /module/FindCABLE
    /module/FindCABLE
    /module/FindCoin3D
    /module/FindCoin3D
-   /module/FindCups
    /module/FindCUDAToolkit
    /module/FindCUDAToolkit
+   /module/FindCups
    /module/FindCURL
    /module/FindCURL
    /module/FindCurses
    /module/FindCurses
    /module/FindCVS
    /module/FindCVS
@@ -139,8 +139,8 @@ They are normally called through the :command:`find_package` command.
    /module/FindEnvModules
    /module/FindEnvModules
    /module/FindEXPAT
    /module/FindEXPAT
    /module/FindFLEX
    /module/FindFLEX
-   /module/FindFLTK2
    /module/FindFLTK
    /module/FindFLTK
+   /module/FindFLTK2
    /module/FindFontconfig
    /module/FindFontconfig
    /module/FindFreetype
    /module/FindFreetype
    /module/FindGCCXML
    /module/FindGCCXML
@@ -154,17 +154,17 @@ They are normally called through the :command:`find_package` command.
    /module/FindGnuTLS
    /module/FindGnuTLS
    /module/FindGSL
    /module/FindGSL
    /module/FindGTest
    /module/FindGTest
-   /module/FindGTK2
    /module/FindGTK
    /module/FindGTK
+   /module/FindGTK2
    /module/FindHDF5
    /module/FindHDF5
    /module/FindHg
    /module/FindHg
    /module/FindHSPELL
    /module/FindHSPELL
    /module/FindHTMLHelp
    /module/FindHTMLHelp
    /module/FindIce
    /module/FindIce
+   /module/FindIconv
    /module/FindIcotool
    /module/FindIcotool
    /module/FindICU
    /module/FindICU
    /module/FindImageMagick
    /module/FindImageMagick
-   /module/FindIconv
    /module/FindIntl
    /module/FindIntl
    /module/FindITK
    /module/FindITK
    /module/FindJasper
    /module/FindJasper
@@ -181,14 +181,14 @@ They are normally called through the :command:`find_package` command.
    /module/FindLibXml2
    /module/FindLibXml2
    /module/FindLibXslt
    /module/FindLibXslt
    /module/FindLTTngUST
    /module/FindLTTngUST
+   /module/FindLua
    /module/FindLua50
    /module/FindLua50
    /module/FindLua51
    /module/FindLua51
-   /module/FindLua
    /module/FindMatlab
    /module/FindMatlab
    /module/FindMFC
    /module/FindMFC
    /module/FindMotif
    /module/FindMotif
-   /module/FindMPEG2
    /module/FindMPEG
    /module/FindMPEG
+   /module/FindMPEG2
    /module/FindMPI
    /module/FindMPI
    /module/FindODBC
    /module/FindODBC
    /module/FindOpenACC
    /module/FindOpenACC
@@ -199,9 +199,10 @@ They are normally called through the :command:`find_package` command.
    /module/FindOpenSceneGraph
    /module/FindOpenSceneGraph
    /module/FindOpenSSL
    /module/FindOpenSSL
    /module/FindOpenThreads
    /module/FindOpenThreads
+   /module/Findosg
+   /module/Findosg_functions
    /module/FindosgAnimation
    /module/FindosgAnimation
    /module/FindosgDB
    /module/FindosgDB
-   /module/Findosg_functions
    /module/FindosgFX
    /module/FindosgFX
    /module/FindosgGA
    /module/FindosgGA
    /module/FindosgIntrospection
    /module/FindosgIntrospection
@@ -210,7 +211,6 @@ They are normally called through the :command:`find_package` command.
    /module/FindosgPresentation
    /module/FindosgPresentation
    /module/FindosgProducer
    /module/FindosgProducer
    /module/FindosgQt
    /module/FindosgQt
-   /module/Findosg
    /module/FindosgShadow
    /module/FindosgShadow
    /module/FindosgSim
    /module/FindosgSim
    /module/FindosgTerrain
    /module/FindosgTerrain
@@ -220,8 +220,8 @@ They are normally called through the :command:`find_package` command.
    /module/FindosgVolume
    /module/FindosgVolume
    /module/FindosgWidget
    /module/FindosgWidget
    /module/FindPatch
    /module/FindPatch
-   /module/FindPerlLibs
    /module/FindPerl
    /module/FindPerl
+   /module/FindPerlLibs
    /module/FindPHP4
    /module/FindPHP4
    /module/FindPhysFS
    /module/FindPhysFS
    /module/FindPike
    /module/FindPike
@@ -238,10 +238,10 @@ They are normally called through the :command:`find_package` command.
    /module/FindQuickTime
    /module/FindQuickTime
    /module/FindRTI
    /module/FindRTI
    /module/FindRuby
    /module/FindRuby
+   /module/FindSDL
    /module/FindSDL_image
    /module/FindSDL_image
    /module/FindSDL_mixer
    /module/FindSDL_mixer
    /module/FindSDL_net
    /module/FindSDL_net
-   /module/FindSDL
    /module/FindSDL_sound
    /module/FindSDL_sound
    /module/FindSDL_ttf
    /module/FindSDL_ttf
    /module/FindSelfPackers
    /module/FindSelfPackers
@@ -260,10 +260,10 @@ They are normally called through the :command:`find_package` command.
    /module/FindWget
    /module/FindWget
    /module/FindWish
    /module/FindWish
    /module/FindwxWidgets
    /module/FindwxWidgets
-   /module/FindXCTest
+   /module/FindX11
    /module/FindXalanC
    /module/FindXalanC
+   /module/FindXCTest
    /module/FindXercesC
    /module/FindXercesC
-   /module/FindX11
    /module/FindXMLRPC
    /module/FindXMLRPC
    /module/FindZLIB
    /module/FindZLIB
 
 

+ 39 - 39
Help/manual/cmake-properties.7.rst

@@ -75,8 +75,8 @@ Properties on Directories
    /prop_dir/IMPLICIT_DEPENDS_INCLUDE_TRANSFORM
    /prop_dir/IMPLICIT_DEPENDS_INCLUDE_TRANSFORM
    /prop_dir/INCLUDE_DIRECTORIES
    /prop_dir/INCLUDE_DIRECTORIES
    /prop_dir/INCLUDE_REGULAR_EXPRESSION
    /prop_dir/INCLUDE_REGULAR_EXPRESSION
-   /prop_dir/INTERPROCEDURAL_OPTIMIZATION_CONFIG
    /prop_dir/INTERPROCEDURAL_OPTIMIZATION
    /prop_dir/INTERPROCEDURAL_OPTIMIZATION
+   /prop_dir/INTERPROCEDURAL_OPTIMIZATION_CONFIG
    /prop_dir/LABELS
    /prop_dir/LABELS
    /prop_dir/LINK_DIRECTORIES
    /prop_dir/LINK_DIRECTORIES
    /prop_dir/LINK_OPTIONS
    /prop_dir/LINK_OPTIONS
@@ -124,10 +124,10 @@ Properties on Targets
    /prop_tgt/ANDROID_SECURE_PROPS_PATH
    /prop_tgt/ANDROID_SECURE_PROPS_PATH
    /prop_tgt/ANDROID_SKIP_ANT_STEP
    /prop_tgt/ANDROID_SKIP_ANT_STEP
    /prop_tgt/ANDROID_STL_TYPE
    /prop_tgt/ANDROID_STL_TYPE
-   /prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG
    /prop_tgt/ARCHIVE_OUTPUT_DIRECTORY
    /prop_tgt/ARCHIVE_OUTPUT_DIRECTORY
-   /prop_tgt/ARCHIVE_OUTPUT_NAME_CONFIG
+   /prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG
    /prop_tgt/ARCHIVE_OUTPUT_NAME
    /prop_tgt/ARCHIVE_OUTPUT_NAME
+   /prop_tgt/ARCHIVE_OUTPUT_NAME_CONFIG
    /prop_tgt/AUTOGEN_BUILD_DIR
    /prop_tgt/AUTOGEN_BUILD_DIR
    /prop_tgt/AUTOGEN_ORIGIN_DEPENDS
    /prop_tgt/AUTOGEN_ORIGIN_DEPENDS
    /prop_tgt/AUTOGEN_PARALLEL
    /prop_tgt/AUTOGEN_PARALLEL
@@ -151,8 +151,8 @@ Properties on Targets
    /prop_tgt/BUILD_RPATH_USE_ORIGIN
    /prop_tgt/BUILD_RPATH_USE_ORIGIN
    /prop_tgt/BUILD_WITH_INSTALL_NAME_DIR
    /prop_tgt/BUILD_WITH_INSTALL_NAME_DIR
    /prop_tgt/BUILD_WITH_INSTALL_RPATH
    /prop_tgt/BUILD_WITH_INSTALL_RPATH
-   /prop_tgt/BUNDLE_EXTENSION
    /prop_tgt/BUNDLE
    /prop_tgt/BUNDLE
+   /prop_tgt/BUNDLE_EXTENSION
    /prop_tgt/C_EXTENSIONS
    /prop_tgt/C_EXTENSIONS
    /prop_tgt/C_STANDARD
    /prop_tgt/C_STANDARD
    /prop_tgt/C_STANDARD_REQUIRED
    /prop_tgt/C_STANDARD_REQUIRED
@@ -173,11 +173,11 @@ Properties on Targets
    /prop_tgt/CONFIG_POSTFIX
    /prop_tgt/CONFIG_POSTFIX
    /prop_tgt/CROSSCOMPILING_EMULATOR
    /prop_tgt/CROSSCOMPILING_EMULATOR
    /prop_tgt/CUDA_ARCHITECTURES
    /prop_tgt/CUDA_ARCHITECTURES
+   /prop_tgt/CUDA_EXTENSIONS
    /prop_tgt/CUDA_PTX_COMPILATION
    /prop_tgt/CUDA_PTX_COMPILATION
-   /prop_tgt/CUDA_SEPARABLE_COMPILATION
    /prop_tgt/CUDA_RESOLVE_DEVICE_SYMBOLS
    /prop_tgt/CUDA_RESOLVE_DEVICE_SYMBOLS
    /prop_tgt/CUDA_RUNTIME_LIBRARY
    /prop_tgt/CUDA_RUNTIME_LIBRARY
-   /prop_tgt/CUDA_EXTENSIONS
+   /prop_tgt/CUDA_SEPARABLE_COMPILATION
    /prop_tgt/CUDA_STANDARD
    /prop_tgt/CUDA_STANDARD
    /prop_tgt/CUDA_STANDARD_REQUIRED
    /prop_tgt/CUDA_STANDARD_REQUIRED
    /prop_tgt/CXX_EXTENSIONS
    /prop_tgt/CXX_EXTENSIONS
@@ -185,8 +185,8 @@ Properties on Targets
    /prop_tgt/CXX_STANDARD_REQUIRED
    /prop_tgt/CXX_STANDARD_REQUIRED
    /prop_tgt/DEBUG_POSTFIX
    /prop_tgt/DEBUG_POSTFIX
    /prop_tgt/DEFINE_SYMBOL
    /prop_tgt/DEFINE_SYMBOL
-   /prop_tgt/DEPLOYMENT_REMOTE_DIRECTORY
    /prop_tgt/DEPLOYMENT_ADDITIONAL_FILES
    /prop_tgt/DEPLOYMENT_ADDITIONAL_FILES
+   /prop_tgt/DEPLOYMENT_REMOTE_DIRECTORY
    /prop_tgt/DEPRECATION
    /prop_tgt/DEPRECATION
    /prop_tgt/DISABLE_PRECOMPILE_HEADERS
    /prop_tgt/DISABLE_PRECOMPILE_HEADERS
    /prop_tgt/DOTNET_TARGET_FRAMEWORK
    /prop_tgt/DOTNET_TARGET_FRAMEWORK
@@ -194,8 +194,8 @@ Properties on Targets
    /prop_tgt/EchoString
    /prop_tgt/EchoString
    /prop_tgt/ENABLE_EXPORTS
    /prop_tgt/ENABLE_EXPORTS
    /prop_tgt/EXCLUDE_FROM_ALL
    /prop_tgt/EXCLUDE_FROM_ALL
-   /prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD_CONFIG
    /prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD
    /prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD
+   /prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD_CONFIG
    /prop_tgt/EXPORT_NAME
    /prop_tgt/EXPORT_NAME
    /prop_tgt/EXPORT_PROPERTIES
    /prop_tgt/EXPORT_PROPERTIES
    /prop_tgt/FOLDER
    /prop_tgt/FOLDER
@@ -211,30 +211,30 @@ Properties on Targets
    /prop_tgt/GNUtoMS
    /prop_tgt/GNUtoMS
    /prop_tgt/HAS_CXX
    /prop_tgt/HAS_CXX
    /prop_tgt/IMPLICIT_DEPENDS_INCLUDE_TRANSFORM
    /prop_tgt/IMPLICIT_DEPENDS_INCLUDE_TRANSFORM
+   /prop_tgt/IMPORTED
    /prop_tgt/IMPORTED_COMMON_LANGUAGE_RUNTIME
    /prop_tgt/IMPORTED_COMMON_LANGUAGE_RUNTIME
    /prop_tgt/IMPORTED_CONFIGURATIONS
    /prop_tgt/IMPORTED_CONFIGURATIONS
    /prop_tgt/IMPORTED_GLOBAL
    /prop_tgt/IMPORTED_GLOBAL
-   /prop_tgt/IMPORTED_IMPLIB_CONFIG
    /prop_tgt/IMPORTED_IMPLIB
    /prop_tgt/IMPORTED_IMPLIB
-   /prop_tgt/IMPORTED_LIBNAME_CONFIG
+   /prop_tgt/IMPORTED_IMPLIB_CONFIG
    /prop_tgt/IMPORTED_LIBNAME
    /prop_tgt/IMPORTED_LIBNAME
-   /prop_tgt/IMPORTED_LINK_DEPENDENT_LIBRARIES_CONFIG
+   /prop_tgt/IMPORTED_LIBNAME_CONFIG
    /prop_tgt/IMPORTED_LINK_DEPENDENT_LIBRARIES
    /prop_tgt/IMPORTED_LINK_DEPENDENT_LIBRARIES
-   /prop_tgt/IMPORTED_LINK_INTERFACE_LANGUAGES_CONFIG
+   /prop_tgt/IMPORTED_LINK_DEPENDENT_LIBRARIES_CONFIG
    /prop_tgt/IMPORTED_LINK_INTERFACE_LANGUAGES
    /prop_tgt/IMPORTED_LINK_INTERFACE_LANGUAGES
-   /prop_tgt/IMPORTED_LINK_INTERFACE_LIBRARIES_CONFIG
+   /prop_tgt/IMPORTED_LINK_INTERFACE_LANGUAGES_CONFIG
    /prop_tgt/IMPORTED_LINK_INTERFACE_LIBRARIES
    /prop_tgt/IMPORTED_LINK_INTERFACE_LIBRARIES
-   /prop_tgt/IMPORTED_LINK_INTERFACE_MULTIPLICITY_CONFIG
+   /prop_tgt/IMPORTED_LINK_INTERFACE_LIBRARIES_CONFIG
    /prop_tgt/IMPORTED_LINK_INTERFACE_MULTIPLICITY
    /prop_tgt/IMPORTED_LINK_INTERFACE_MULTIPLICITY
-   /prop_tgt/IMPORTED_LOCATION_CONFIG
+   /prop_tgt/IMPORTED_LINK_INTERFACE_MULTIPLICITY_CONFIG
    /prop_tgt/IMPORTED_LOCATION
    /prop_tgt/IMPORTED_LOCATION
-   /prop_tgt/IMPORTED_NO_SONAME_CONFIG
+   /prop_tgt/IMPORTED_LOCATION_CONFIG
    /prop_tgt/IMPORTED_NO_SONAME
    /prop_tgt/IMPORTED_NO_SONAME
-   /prop_tgt/IMPORTED_OBJECTS_CONFIG
+   /prop_tgt/IMPORTED_NO_SONAME_CONFIG
    /prop_tgt/IMPORTED_OBJECTS
    /prop_tgt/IMPORTED_OBJECTS
-   /prop_tgt/IMPORTED
-   /prop_tgt/IMPORTED_SONAME_CONFIG
+   /prop_tgt/IMPORTED_OBJECTS_CONFIG
    /prop_tgt/IMPORTED_SONAME
    /prop_tgt/IMPORTED_SONAME
+   /prop_tgt/IMPORTED_SONAME_CONFIG
    /prop_tgt/IMPORT_PREFIX
    /prop_tgt/IMPORT_PREFIX
    /prop_tgt/IMPORT_SUFFIX
    /prop_tgt/IMPORT_SUFFIX
    /prop_tgt/INCLUDE_DIRECTORIES
    /prop_tgt/INCLUDE_DIRECTORIES
@@ -251,12 +251,12 @@ Properties on Targets
    /prop_tgt/INTERFACE_LINK_DIRECTORIES
    /prop_tgt/INTERFACE_LINK_DIRECTORIES
    /prop_tgt/INTERFACE_LINK_LIBRARIES
    /prop_tgt/INTERFACE_LINK_LIBRARIES
    /prop_tgt/INTERFACE_LINK_OPTIONS
    /prop_tgt/INTERFACE_LINK_OPTIONS
-   /prop_tgt/INTERFACE_PRECOMPILE_HEADERS
    /prop_tgt/INTERFACE_POSITION_INDEPENDENT_CODE
    /prop_tgt/INTERFACE_POSITION_INDEPENDENT_CODE
+   /prop_tgt/INTERFACE_PRECOMPILE_HEADERS
    /prop_tgt/INTERFACE_SOURCES
    /prop_tgt/INTERFACE_SOURCES
    /prop_tgt/INTERFACE_SYSTEM_INCLUDE_DIRECTORIES
    /prop_tgt/INTERFACE_SYSTEM_INCLUDE_DIRECTORIES
-   /prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG
    /prop_tgt/INTERPROCEDURAL_OPTIMIZATION
    /prop_tgt/INTERPROCEDURAL_OPTIMIZATION
+   /prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG
    /prop_tgt/IOS_INSTALL_COMBINED
    /prop_tgt/IOS_INSTALL_COMBINED
    /prop_tgt/ISPC_HEADER_DIRECTORY
    /prop_tgt/ISPC_HEADER_DIRECTORY
    /prop_tgt/ISPC_INSTRUCTION_SETS
    /prop_tgt/ISPC_INSTRUCTION_SETS
@@ -270,31 +270,31 @@ Properties on Targets
    /prop_tgt/LANG_CPPLINT
    /prop_tgt/LANG_CPPLINT
    /prop_tgt/LANG_INCLUDE_WHAT_YOU_USE
    /prop_tgt/LANG_INCLUDE_WHAT_YOU_USE
    /prop_tgt/LANG_VISIBILITY_PRESET
    /prop_tgt/LANG_VISIBILITY_PRESET
-   /prop_tgt/LIBRARY_OUTPUT_DIRECTORY_CONFIG
    /prop_tgt/LIBRARY_OUTPUT_DIRECTORY
    /prop_tgt/LIBRARY_OUTPUT_DIRECTORY
-   /prop_tgt/LIBRARY_OUTPUT_NAME_CONFIG
+   /prop_tgt/LIBRARY_OUTPUT_DIRECTORY_CONFIG
    /prop_tgt/LIBRARY_OUTPUT_NAME
    /prop_tgt/LIBRARY_OUTPUT_NAME
-   /prop_tgt/LINK_DEPENDS_NO_SHARED
+   /prop_tgt/LIBRARY_OUTPUT_NAME_CONFIG
    /prop_tgt/LINK_DEPENDS
    /prop_tgt/LINK_DEPENDS
-   /prop_tgt/LINKER_LANGUAGE
+   /prop_tgt/LINK_DEPENDS_NO_SHARED
    /prop_tgt/LINK_DIRECTORIES
    /prop_tgt/LINK_DIRECTORIES
-   /prop_tgt/LINK_FLAGS_CONFIG
    /prop_tgt/LINK_FLAGS
    /prop_tgt/LINK_FLAGS
-   /prop_tgt/LINK_INTERFACE_LIBRARIES_CONFIG
+   /prop_tgt/LINK_FLAGS_CONFIG
    /prop_tgt/LINK_INTERFACE_LIBRARIES
    /prop_tgt/LINK_INTERFACE_LIBRARIES
-   /prop_tgt/LINK_INTERFACE_MULTIPLICITY_CONFIG
+   /prop_tgt/LINK_INTERFACE_LIBRARIES_CONFIG
    /prop_tgt/LINK_INTERFACE_MULTIPLICITY
    /prop_tgt/LINK_INTERFACE_MULTIPLICITY
+   /prop_tgt/LINK_INTERFACE_MULTIPLICITY_CONFIG
    /prop_tgt/LINK_LIBRARIES
    /prop_tgt/LINK_LIBRARIES
    /prop_tgt/LINK_OPTIONS
    /prop_tgt/LINK_OPTIONS
    /prop_tgt/LINK_SEARCH_END_STATIC
    /prop_tgt/LINK_SEARCH_END_STATIC
    /prop_tgt/LINK_SEARCH_START_STATIC
    /prop_tgt/LINK_SEARCH_START_STATIC
    /prop_tgt/LINK_WHAT_YOU_USE
    /prop_tgt/LINK_WHAT_YOU_USE
-   /prop_tgt/LOCATION_CONFIG
+   /prop_tgt/LINKER_LANGUAGE
    /prop_tgt/LOCATION
    /prop_tgt/LOCATION
+   /prop_tgt/LOCATION_CONFIG
    /prop_tgt/MACHO_COMPATIBILITY_VERSION
    /prop_tgt/MACHO_COMPATIBILITY_VERSION
    /prop_tgt/MACHO_CURRENT_VERSION
    /prop_tgt/MACHO_CURRENT_VERSION
-   /prop_tgt/MACOSX_BUNDLE_INFO_PLIST
    /prop_tgt/MACOSX_BUNDLE
    /prop_tgt/MACOSX_BUNDLE
+   /prop_tgt/MACOSX_BUNDLE_INFO_PLIST
    /prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST
    /prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST
    /prop_tgt/MACOSX_RPATH
    /prop_tgt/MACOSX_RPATH
    /prop_tgt/MANUALLY_ADDED_DEPENDENCIES
    /prop_tgt/MANUALLY_ADDED_DEPENDENCIES
@@ -310,16 +310,16 @@ Properties on Targets
    /prop_tgt/OBJCXX_STANDARD
    /prop_tgt/OBJCXX_STANDARD
    /prop_tgt/OBJCXX_STANDARD_REQUIRED
    /prop_tgt/OBJCXX_STANDARD_REQUIRED
    /prop_tgt/OPTIMIZE_DEPENDENCIES
    /prop_tgt/OPTIMIZE_DEPENDENCIES
-   /prop_tgt/OSX_ARCHITECTURES_CONFIG
    /prop_tgt/OSX_ARCHITECTURES
    /prop_tgt/OSX_ARCHITECTURES
-   /prop_tgt/OUTPUT_NAME_CONFIG
+   /prop_tgt/OSX_ARCHITECTURES_CONFIG
    /prop_tgt/OUTPUT_NAME
    /prop_tgt/OUTPUT_NAME
+   /prop_tgt/OUTPUT_NAME_CONFIG
    /prop_tgt/PCH_WARN_INVALID
    /prop_tgt/PCH_WARN_INVALID
    /prop_tgt/PCH_INSTANTIATE_TEMPLATES
    /prop_tgt/PCH_INSTANTIATE_TEMPLATES
-   /prop_tgt/PDB_NAME_CONFIG
    /prop_tgt/PDB_NAME
    /prop_tgt/PDB_NAME
-   /prop_tgt/PDB_OUTPUT_DIRECTORY_CONFIG
+   /prop_tgt/PDB_NAME_CONFIG
    /prop_tgt/PDB_OUTPUT_DIRECTORY
    /prop_tgt/PDB_OUTPUT_DIRECTORY
+   /prop_tgt/PDB_OUTPUT_DIRECTORY_CONFIG
    /prop_tgt/POSITION_INDEPENDENT_CODE
    /prop_tgt/POSITION_INDEPENDENT_CODE
    /prop_tgt/PRECOMPILE_HEADERS
    /prop_tgt/PRECOMPILE_HEADERS
    /prop_tgt/PRECOMPILE_HEADERS_REUSE_FROM
    /prop_tgt/PRECOMPILE_HEADERS_REUSE_FROM
@@ -331,16 +331,16 @@ Properties on Targets
    /prop_tgt/RULE_LAUNCH_COMPILE
    /prop_tgt/RULE_LAUNCH_COMPILE
    /prop_tgt/RULE_LAUNCH_CUSTOM
    /prop_tgt/RULE_LAUNCH_CUSTOM
    /prop_tgt/RULE_LAUNCH_LINK
    /prop_tgt/RULE_LAUNCH_LINK
-   /prop_tgt/RUNTIME_OUTPUT_DIRECTORY_CONFIG
    /prop_tgt/RUNTIME_OUTPUT_DIRECTORY
    /prop_tgt/RUNTIME_OUTPUT_DIRECTORY
-   /prop_tgt/RUNTIME_OUTPUT_NAME_CONFIG
+   /prop_tgt/RUNTIME_OUTPUT_DIRECTORY_CONFIG
    /prop_tgt/RUNTIME_OUTPUT_NAME
    /prop_tgt/RUNTIME_OUTPUT_NAME
+   /prop_tgt/RUNTIME_OUTPUT_NAME_CONFIG
    /prop_tgt/SKIP_BUILD_RPATH
    /prop_tgt/SKIP_BUILD_RPATH
    /prop_tgt/SOURCE_DIR
    /prop_tgt/SOURCE_DIR
    /prop_tgt/SOURCES
    /prop_tgt/SOURCES
    /prop_tgt/SOVERSION
    /prop_tgt/SOVERSION
-   /prop_tgt/STATIC_LIBRARY_FLAGS_CONFIG
    /prop_tgt/STATIC_LIBRARY_FLAGS
    /prop_tgt/STATIC_LIBRARY_FLAGS
+   /prop_tgt/STATIC_LIBRARY_FLAGS_CONFIG
    /prop_tgt/STATIC_LIBRARY_OPTIONS
    /prop_tgt/STATIC_LIBRARY_OPTIONS
    /prop_tgt/SUFFIX
    /prop_tgt/SUFFIX
    /prop_tgt/Swift_DEPENDENCIES_FILE
    /prop_tgt/Swift_DEPENDENCIES_FILE
@@ -361,12 +361,12 @@ Properties on Targets
    /prop_tgt/VS_DEBUGGER_ENVIRONMENT
    /prop_tgt/VS_DEBUGGER_ENVIRONMENT
    /prop_tgt/VS_DEBUGGER_WORKING_DIRECTORY
    /prop_tgt/VS_DEBUGGER_WORKING_DIRECTORY
    /prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION
    /prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION
+   /prop_tgt/VS_DOTNET_DOCUMENTATION_FILE
    /prop_tgt/VS_DOTNET_REFERENCE_refname
    /prop_tgt/VS_DOTNET_REFERENCE_refname
    /prop_tgt/VS_DOTNET_REFERENCEPROP_refname_TAG_tagname
    /prop_tgt/VS_DOTNET_REFERENCEPROP_refname_TAG_tagname
    /prop_tgt/VS_DOTNET_REFERENCES
    /prop_tgt/VS_DOTNET_REFERENCES
    /prop_tgt/VS_DOTNET_REFERENCES_COPY_LOCAL
    /prop_tgt/VS_DOTNET_REFERENCES_COPY_LOCAL
    /prop_tgt/VS_DOTNET_TARGET_FRAMEWORK_VERSION
    /prop_tgt/VS_DOTNET_TARGET_FRAMEWORK_VERSION
-   /prop_tgt/VS_DOTNET_DOCUMENTATION_FILE
    /prop_tgt/VS_DPI_AWARE
    /prop_tgt/VS_DPI_AWARE
    /prop_tgt/VS_GLOBAL_KEYWORD
    /prop_tgt/VS_GLOBAL_KEYWORD
    /prop_tgt/VS_GLOBAL_PROJECT_TYPES
    /prop_tgt/VS_GLOBAL_PROJECT_TYPES
@@ -431,8 +431,8 @@ Properties on Tests
 .. toctree::
 .. toctree::
    :maxdepth: 1
    :maxdepth: 1
 
 
-   /prop_test/ATTACHED_FILES_ON_FAIL
    /prop_test/ATTACHED_FILES
    /prop_test/ATTACHED_FILES
+   /prop_test/ATTACHED_FILES_ON_FAIL
    /prop_test/COST
    /prop_test/COST
    /prop_test/DEPENDS
    /prop_test/DEPENDS
    /prop_test/DISABLED
    /prop_test/DISABLED

+ 4 - 4
Help/manual/cmake-variables.7.rst

@@ -27,10 +27,10 @@ Variables that Provide Information
    /variable/CMAKE_ARGV0
    /variable/CMAKE_ARGV0
    /variable/CMAKE_BINARY_DIR
    /variable/CMAKE_BINARY_DIR
    /variable/CMAKE_BUILD_TOOL
    /variable/CMAKE_BUILD_TOOL
-   /variable/CMAKE_CACHEFILE_DIR
    /variable/CMAKE_CACHE_MAJOR_VERSION
    /variable/CMAKE_CACHE_MAJOR_VERSION
    /variable/CMAKE_CACHE_MINOR_VERSION
    /variable/CMAKE_CACHE_MINOR_VERSION
    /variable/CMAKE_CACHE_PATCH_VERSION
    /variable/CMAKE_CACHE_PATCH_VERSION
+   /variable/CMAKE_CACHEFILE_DIR
    /variable/CMAKE_CFG_INTDIR
    /variable/CMAKE_CFG_INTDIR
    /variable/CMAKE_COMMAND
    /variable/CMAKE_COMMAND
    /variable/CMAKE_CPACK_COMMAND
    /variable/CMAKE_CPACK_COMMAND
@@ -378,9 +378,9 @@ Variables that Control the Build
    /variable/CMAKE_CONFIG_POSTFIX
    /variable/CMAKE_CONFIG_POSTFIX
    /variable/CMAKE_CROSS_CONFIGS
    /variable/CMAKE_CROSS_CONFIGS
    /variable/CMAKE_CTEST_ARGUMENTS
    /variable/CMAKE_CTEST_ARGUMENTS
-   /variable/CMAKE_CUDA_SEPARABLE_COMPILATION
    /variable/CMAKE_CUDA_RESOLVE_DEVICE_SYMBOLS
    /variable/CMAKE_CUDA_RESOLVE_DEVICE_SYMBOLS
    /variable/CMAKE_CUDA_RUNTIME_LIBRARY
    /variable/CMAKE_CUDA_RUNTIME_LIBRARY
+   /variable/CMAKE_CUDA_SEPARABLE_COMPILATION
    /variable/CMAKE_DEBUG_POSTFIX
    /variable/CMAKE_DEBUG_POSTFIX
    /variable/CMAKE_DEFAULT_BUILD_TYPE
    /variable/CMAKE_DEFAULT_BUILD_TYPE
    /variable/CMAKE_DEFAULT_CONFIGS
    /variable/CMAKE_DEFAULT_CONFIGS
@@ -497,8 +497,8 @@ Variables for Languages
    /variable/CMAKE_COMPILER_IS_GNUG77
    /variable/CMAKE_COMPILER_IS_GNUG77
    /variable/CMAKE_CUDA_ARCHITECTURES
    /variable/CMAKE_CUDA_ARCHITECTURES
    /variable/CMAKE_CUDA_COMPILE_FEATURES
    /variable/CMAKE_CUDA_COMPILE_FEATURES
-   /variable/CMAKE_CUDA_HOST_COMPILER
    /variable/CMAKE_CUDA_EXTENSIONS
    /variable/CMAKE_CUDA_EXTENSIONS
+   /variable/CMAKE_CUDA_HOST_COMPILER
    /variable/CMAKE_CUDA_STANDARD
    /variable/CMAKE_CUDA_STANDARD
    /variable/CMAKE_CUDA_STANDARD_REQUIRED
    /variable/CMAKE_CUDA_STANDARD_REQUIRED
    /variable/CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES
    /variable/CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES
@@ -550,11 +550,11 @@ Variables for Languages
    /variable/CMAKE_LANG_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES
    /variable/CMAKE_LANG_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES
    /variable/CMAKE_LANG_IMPLICIT_LINK_LIBRARIES
    /variable/CMAKE_LANG_IMPLICIT_LINK_LIBRARIES
    /variable/CMAKE_LANG_LIBRARY_ARCHITECTURE
    /variable/CMAKE_LANG_LIBRARY_ARCHITECTURE
+   /variable/CMAKE_LANG_LINK_EXECUTABLE
    /variable/CMAKE_LANG_LINKER_PREFERENCE
    /variable/CMAKE_LANG_LINKER_PREFERENCE
    /variable/CMAKE_LANG_LINKER_PREFERENCE_PROPAGATES
    /variable/CMAKE_LANG_LINKER_PREFERENCE_PROPAGATES
    /variable/CMAKE_LANG_LINKER_WRAPPER_FLAG
    /variable/CMAKE_LANG_LINKER_WRAPPER_FLAG
    /variable/CMAKE_LANG_LINKER_WRAPPER_FLAG_SEP
    /variable/CMAKE_LANG_LINKER_WRAPPER_FLAG_SEP
-   /variable/CMAKE_LANG_LINK_EXECUTABLE
    /variable/CMAKE_LANG_OUTPUT_EXTENSION
    /variable/CMAKE_LANG_OUTPUT_EXTENSION
    /variable/CMAKE_LANG_SIMULATE_ID
    /variable/CMAKE_LANG_SIMULATE_ID
    /variable/CMAKE_LANG_SIMULATE_VERSION
    /variable/CMAKE_LANG_SIMULATE_VERSION

+ 3 - 0
Help/prop_tgt/OPTIMIZE_DEPENDENCIES.rst

@@ -38,3 +38,6 @@ side effects that are relevant for the Fortran library. However, if you build
 the middle C library, the bottom Fortran library will also build, even though
 the middle C library, the bottom Fortran library will also build, even though
 it does not have any side effects that are relevant to the C library, since the
 it does not have any side effects that are relevant to the C library, since the
 C library does not have optimization enabled.
 C library does not have optimization enabled.
+
+This property is initialized by the value of the
+:variable:`CMAKE_OPTIMIZE_DEPENDENCIES` variable when the target is created.