diff options
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/command/DEVICE_LINK_OPTIONS.txt | 7 | ||||
| -rw-r--r-- | Help/manual/cmake-generator-expressions.7.rst | 5 | ||||
| -rw-r--r-- | Help/manual/cmake-properties.7.rst | 2 | ||||
| -rw-r--r-- | Help/prop_sf/VS_SETTINGS.rst | 2 | ||||
| -rw-r--r-- | Help/prop_tgt/FRAMEWORK_MULTI_CONFIG_POSTFIX_CONFIG.rst | 23 | ||||
| -rw-r--r-- | Help/prop_tgt/PCH_WARN_INVALID.rst | 6 | ||||
| -rw-r--r-- | Help/prop_tgt/VS_SOLUTION_DEPLOY.rst | 16 | ||||
| -rw-r--r-- | Help/prop_tgt/VS_SOURCE_SETTINGS_tool.rst | 2 | ||||
| -rw-r--r-- | Help/release/3.18.rst | 23 |
9 files changed, 46 insertions, 40 deletions
diff --git a/Help/command/DEVICE_LINK_OPTIONS.txt b/Help/command/DEVICE_LINK_OPTIONS.txt index 012e9b1..3f0226f 100644 --- a/Help/command/DEVICE_LINK_OPTIONS.txt +++ b/Help/command/DEVICE_LINK_OPTIONS.txt @@ -1,9 +1,10 @@ When a device link step is involved, which is controlled by :prop_tgt:`CUDA_SEPARABLE_COMPILATION` and -:prop_tgt:`CUDA_RESOLVE_DEVICE_SYMBOLS` properties, the raw options will be -delivered to the host and device link steps (wrapped in ``-Xcompiler`` or -equivalent for device link). Options wrapped with ``$<DEVICE_LINK:...>`` +:prop_tgt:`CUDA_RESOLVE_DEVICE_SYMBOLS` properties and policy :policy:`CMP0105`, +the raw options will be delivered to the host and device link steps (wrapped in +``-Xcompiler`` or equivalent for device link). Options wrapped with +``$<DEVICE_LINK:...>`` :manual:`generator expression <cmake-generator-expressions(7)>` will be used only for the device link step. Options wrapped with ``$<HOST_LINK:...>`` :manual:`generator expression <cmake-generator-expressions(7)>` will be used diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst index 9e411a4..124da44 100644 --- a/Help/manual/cmake-generator-expressions.7.rst +++ b/Help/manual/cmake-generator-expressions.7.rst @@ -365,8 +365,9 @@ Variable Queries ``$<DEVICE_LINK:list>`` Returns the list if it is the device link step, an empty list otherwise. The device link step is controlled by :prop_tgt:`CUDA_SEPARABLE_COMPILATION` - and :prop_tgt:`CUDA_RESOLVE_DEVICE_SYMBOLS` properties. This expression can - only be used to specify link options. + and :prop_tgt:`CUDA_RESOLVE_DEVICE_SYMBOLS` properties and + policy :policy:`CMP0105`. This expression can only be used to specify link + options. ``$<HOST_LINK:list>`` Returns the list if it is the normal link step, an empty list otherwise. diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst index 7f7ed50..30b2a05 100644 --- a/Help/manual/cmake-properties.7.rst +++ b/Help/manual/cmake-properties.7.rst @@ -128,7 +128,6 @@ Properties on Targets /prop_tgt/ARCHIVE_OUTPUT_DIRECTORY /prop_tgt/ARCHIVE_OUTPUT_NAME_CONFIG /prop_tgt/ARCHIVE_OUTPUT_NAME - /prop_tgt/PCH_WARN_INVALID /prop_tgt/AUTOGEN_BUILD_DIR /prop_tgt/AUTOGEN_ORIGIN_DEPENDS /prop_tgt/AUTOGEN_PARALLEL @@ -312,6 +311,7 @@ Properties on Targets /prop_tgt/OSX_ARCHITECTURES /prop_tgt/OUTPUT_NAME_CONFIG /prop_tgt/OUTPUT_NAME + /prop_tgt/PCH_WARN_INVALID /prop_tgt/PDB_NAME_CONFIG /prop_tgt/PDB_NAME /prop_tgt/PDB_OUTPUT_DIRECTORY_CONFIG diff --git a/Help/prop_sf/VS_SETTINGS.rst b/Help/prop_sf/VS_SETTINGS.rst index 0719406..50034fb 100644 --- a/Help/prop_sf/VS_SETTINGS.rst +++ b/Help/prop_sf/VS_SETTINGS.rst @@ -15,4 +15,4 @@ For example: will set ``Key`` to ``Value`` and ``Key2`` to ``Value2`` on the ``file.hlsl`` item as metadata. -Generator expressions are supported. +:manual:`Generator expressions <cmake-generator-expressions(7)>` are supported. diff --git a/Help/prop_tgt/FRAMEWORK_MULTI_CONFIG_POSTFIX_CONFIG.rst b/Help/prop_tgt/FRAMEWORK_MULTI_CONFIG_POSTFIX_CONFIG.rst index 2b20bf9..5d0fc3d 100644 --- a/Help/prop_tgt/FRAMEWORK_MULTI_CONFIG_POSTFIX_CONFIG.rst +++ b/Help/prop_tgt/FRAMEWORK_MULTI_CONFIG_POSTFIX_CONFIG.rst @@ -1,24 +1,25 @@ FRAMEWORK_MULTI_CONFIG_POSTFIX_<CONFIG> --------------------------------------- -Postfix to append to the framework file name for configuration <CONFIG>, +Postfix to append to the framework file name for configuration ``<CONFIG>``, when using a multi-config generator (like Xcode and Ninja Multi-Config). -When building with configuration <CONFIG> the value of this property +When building with configuration ``<CONFIG>`` the value of this property is appended to the framework file name built on disk. -For example given a framework called ``my_fw``, a value of ``_debug`` -for the :prop_tgt:`FRAMEWORK_MULTI_CONFIG_POSTFIX_<CONFIG>` property, and -``Debug;Release`` in `CMAKE_CONFIGURATION_TYPES`, the following relevant -files would be created for the ``Debug`` and ``Release`` configurations: +For example, given a framework called ``my_fw``, a value of ``_debug`` +for the ``FRAMEWORK_MULTI_CONFIG_POSTFIX_<CONFIG>`` property, and +``Debug;Release`` in :variable:`CMAKE_CONFIGURATION_TYPES`, the following +relevant files would be created for the ``Debug`` and ``Release`` +configurations: -- Release/my_fw.framework/my_fw -- Release/my_fw.framework/Versions/A/my_fw -- Debug/my_fw.framework/my_fw_debug -- Debug/my_fw.framework/Versions/A/my_fw_debug +- ``Release/my_fw.framework/my_fw`` +- ``Release/my_fw.framework/Versions/A/my_fw`` +- ``Debug/my_fw.framework/my_fw_debug`` +- ``Debug/my_fw.framework/Versions/A/my_fw_debug`` For framework targets, this property is initialized by the value of the -variable :variable:`CMAKE_FRAMEWORK_MULTI_CONFIG_POSTFIX_<CONFIG>` if it +:variable:`CMAKE_FRAMEWORK_MULTI_CONFIG_POSTFIX_<CONFIG>` variable if it is set when a target is created. This property is ignored for non-framework targets, and when using single diff --git a/Help/prop_tgt/PCH_WARN_INVALID.rst b/Help/prop_tgt/PCH_WARN_INVALID.rst index 36ec348..96e1abd 100644 --- a/Help/prop_tgt/PCH_WARN_INVALID.rst +++ b/Help/prop_tgt/PCH_WARN_INVALID.rst @@ -2,7 +2,9 @@ PCH_WARN_INVALID ---------------- When this property is set to true, the precompile header compiler options -will contain a compiler flag wich should warn about invalid precompiled +will contain a compiler flag which should warn about invalid precompiled headers e.g. ``-Winvalid-pch`` for GNU compiler. -The defalut value is ``ON``. +This property is initialized by the value of the +:variable:`CMAKE_PCH_WARN_INVALID` variable if it is set when a target is +created. If that variable is not set, the property defaults to ``ON``. diff --git a/Help/prop_tgt/VS_SOLUTION_DEPLOY.rst b/Help/prop_tgt/VS_SOLUTION_DEPLOY.rst index 7906d75..eef848f 100644 --- a/Help/prop_tgt/VS_SOLUTION_DEPLOY.rst +++ b/Help/prop_tgt/VS_SOLUTION_DEPLOY.rst @@ -4,24 +4,22 @@ VS_SOLUTION_DEPLOY Specify that the target should be marked for deployment when not targeting Windows CE, Windows Phone or a Windows Store application. -If the target platform doesn't support deployment, this property won't have any effect. +If the target platform doesn't support deployment, this property won't have +any effect. -Generator expressions are supported. +:manual:`Generator expressions <cmake-generator-expressions(7)>` are supported. -Example 1 -^^^^^^^^^ +Examples +^^^^^^^^ -This shows setting the variable for the target foo. +Always deploy target ``foo``: .. code-block:: cmake add_executable(foo SHARED foo.cpp) set_property(TARGET foo PROPERTY VS_SOLUTION_DEPLOY ON) -Example 2 -^^^^^^^^^ - -This shows setting the variable for the Release configuration only. +Deploy target ``foo`` for all configurations except ``Release``: .. code-block:: cmake diff --git a/Help/prop_tgt/VS_SOURCE_SETTINGS_tool.rst b/Help/prop_tgt/VS_SOURCE_SETTINGS_tool.rst index f706888..738a912 100644 --- a/Help/prop_tgt/VS_SOURCE_SETTINGS_tool.rst +++ b/Help/prop_tgt/VS_SOURCE_SETTINGS_tool.rst @@ -16,4 +16,4 @@ For example: will set ``Key`` to ``Value`` and ``Key2`` to ``Value2`` for all non-built files that use ``FXCompile``. -Generator expressions are supported. +:manual:`Generator expressions <cmake-generator-expressions(7)>` are supported. diff --git a/Help/release/3.18.rst b/Help/release/3.18.rst index 072f9aa..c98b12a 100644 --- a/Help/release/3.18.rst +++ b/Help/release/3.18.rst @@ -117,6 +117,9 @@ Properties * The :prop_sf:`OBJECT_OUTPUTS` source file property now supports :manual:`generator expressions <cmake-generator-expressions(7)>`. +* The :prop_tgt:`PCH_WARN_INVALID` target property was added to allow the + removal of the precompiled header invalid warning. + * The :prop_tgt:`UNITY_BUILD_MODE` target property was added to tell generators which algorithm to use for grouping included source files. @@ -157,6 +160,14 @@ Modules * The :module:`FindBLAS` module now provides an imported target. +* The :module:`FindCUDAToolkit` module: + + * gained the variable + ``CUDAToolkit_LIBRARY_ROOT``, which is the directory containing the + ``nvvm`` directory and ``version.txt``. + + * uses toolkit and library root found during ``CUDA`` compiler detection. + * The :module:`FindLAPACK` module now provides an imported target. * The :module:`FindPython3`, :module:`FindPython2` and :module:`FindPython` @@ -195,14 +206,6 @@ Modules .. _`SWIG-Fortran`: https://github.com/swig-fortran/swig -* The :module:`FindCUDAToolkit` module: - - * gained the variable - ``CUDAToolkit_LIBRARY_ROOT``, which is the directory containing the - ``nvvm`` directory and ``version.txt``. - - * uses toolkit and library root found during ``CUDA`` compiler detection. - Generator Expressions --------------------- @@ -243,9 +246,9 @@ CPack installer is DPI-aware. * The :cpack_gen:`CPack RPM Generator` gained - :variable:`CPACK_RPM_PRE_TRANS_SCRIPT_FILE` + :variable:`CPACK_RPM_PRE_TRANS_SCRIPT_FILE` and :variable:`CPACK_RPM_POST_TRANS_SCRIPT_FILE` - variables to specify pre- and post-trans scripts. + variables to specify pre- and post-transaction scripts. Other ----- |