diff options
Diffstat (limited to 'Help/manual')
| -rw-r--r-- | Help/manual/cmake-generators.7.rst | 2 | ||||
| -rw-r--r-- | Help/manual/cmake-presets.7.rst | 7 | ||||
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/Help/manual/cmake-generators.7.rst b/Help/manual/cmake-generators.7.rst index 663b18d..034e218 100644 --- a/Help/manual/cmake-generators.7.rst +++ b/Help/manual/cmake-generators.7.rst @@ -102,6 +102,8 @@ Other Generators /generator/Green Hills MULTI /generator/Xcode +.. _`Extra Generators`: + Extra Generators ================ diff --git a/Help/manual/cmake-presets.7.rst b/Help/manual/cmake-presets.7.rst index b43c915..31bd9c0 100644 --- a/Help/manual/cmake-presets.7.rst +++ b/Help/manual/cmake-presets.7.rst @@ -37,10 +37,9 @@ a file may be included multiple times from the same file or from different files. If ``CMakePresets.json`` and ``CMakeUserPresets.json`` are both present, ``CMakeUserPresets.json`` implicitly includes ``CMakePresets.json``, even with no ``include`` field, in all versions of the format. Files directly or -indirectly included from ``CMakePresets.json`` must be inside the project -directory. This restriction does not apply to ``CMakeUserPresets.json`` and -files that it includes, unless those files are also included by -``CMakePresets.json``. +indirectly included from ``CMakePresets.json`` should be guaranteed to be +provided by the project. ``CMakeUserPresets.json`` may include files from +anywhere. Format ====== diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 8c43c22..04c5a53 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -582,8 +582,6 @@ Variables for Languages /variable/CMAKE_LANG_IMPLICIT_LINK_LIBRARIES /variable/CMAKE_LANG_LIBRARY_ARCHITECTURE /variable/CMAKE_LANG_LINK_EXECUTABLE - /variable/CMAKE_LANG_LINKER_PREFERENCE - /variable/CMAKE_LANG_LINKER_PREFERENCE_PROPAGATES /variable/CMAKE_LANG_LINKER_WRAPPER_FLAG /variable/CMAKE_LANG_LINKER_WRAPPER_FLAG_SEP /variable/CMAKE_LANG_OUTPUT_EXTENSION @@ -728,6 +726,8 @@ are subject to change, and not recommended for use in project code. /variable/CMAKE_LANG_COMPILER_ABI /variable/CMAKE_LANG_COMPILER_ARCHITECTURE_ID /variable/CMAKE_LANG_COMPILER_VERSION_INTERNAL + /variable/CMAKE_LANG_LINKER_PREFERENCE + /variable/CMAKE_LANG_LINKER_PREFERENCE_PROPAGATES /variable/CMAKE_LANG_PLATFORM_ID /variable/CMAKE_NOT_USING_CONFIG_FLAGS /variable/CMAKE_VS_INTEL_Fortran_PROJECT_VERSION |