diff options
| -rw-r--r-- | Help/variable/CMAKE_TRY_COMPILE_PLATFORM_VARIABLES.rst | 16 | ||||
| -rw-r--r-- | Modules/InstallRequiredSystemLibraries.cmake | 4 | ||||
| -rwxr-xr-x | Utilities/Scripts/clang-format.bash | 12 |
3 files changed, 26 insertions, 6 deletions
diff --git a/Help/variable/CMAKE_TRY_COMPILE_PLATFORM_VARIABLES.rst b/Help/variable/CMAKE_TRY_COMPILE_PLATFORM_VARIABLES.rst index 8e43465..0f96787 100644 --- a/Help/variable/CMAKE_TRY_COMPILE_PLATFORM_VARIABLES.rst +++ b/Help/variable/CMAKE_TRY_COMPILE_PLATFORM_VARIABLES.rst @@ -8,3 +8,19 @@ the host project. This variable should not be set by project code. It is meant to be set by CMake's platform information modules for the current toolchain, or by a toolchain file when used with :variable:`CMAKE_TOOLCHAIN_FILE`. + +Variables meaningful to CMake, such as :variable:`CMAKE_<LANG>_FLAGS`, are +propagated automatically. The ``CMAKE_TRY_COMPILE_PLATFORM_VARIABLES`` +variable may be set to pass custom variables meaningful to a toolchain file. +For example, a toolchain file may contain: + +.. code-block:: cmake + + set(CMAKE_SYSTEM_NAME ...) + set(CMAKE_TRY_COMPILE_PLATFORM_VARIABLES MY_CUSTOM_VARIABLE) + # ... use MY_CUSTOM_VARIABLE ... + +If a user passes ``-DMY_CUSTOM_VARIABLE=SomeValue`` to CMake then this +setting will be made visible to the toolchain file both for the main +project and for test projects generated by the :command:`try_compile` +command source file signature. diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake index aa84077..1c6e751 100644 --- a/Modules/InstallRequiredSystemLibraries.cmake +++ b/Modules/InstallRequiredSystemLibraries.cmake @@ -25,8 +25,8 @@ # # ``CMAKE_INSTALL_UCRT_LIBRARIES`` # Set to TRUE to install the Windows Universal CRT libraries for -# app-local deployment. This is meaningful only with MSVC from -# Visual Studio 2015 or higher. +# app-local deployment (e.g. to Windows XP). This is meaningful +# only with MSVC from Visual Studio 2015 or higher. # # ``CMAKE_INSTALL_MFC_LIBRARIES`` # Set to TRUE to install the MSVC MFC runtime libraries. diff --git a/Utilities/Scripts/clang-format.bash b/Utilities/Scripts/clang-format.bash index 760a8d4..a9ef62b 100755 --- a/Utilities/Scripts/clang-format.bash +++ b/Utilities/Scripts/clang-format.bash @@ -36,15 +36,19 @@ Example to format locally modified files staged for commit: Utilities/Scripts/clang-format.bash --cached -Example to format the current topic: +Example to format files modified by the most recent commit: - git filter-branch \ - --tree-filter "Utilities/Scripts/clang-format.bash --amend" \ - master.. + Utilities/Scripts/clang-format.bash --amend Example to format all files: Utilities/Scripts/clang-format.bash --tracked + +Example to format the current topic: + + git filter-branch \ + --tree-filter "Utilities/Scripts/clang-format.bash --tracked" \ + master.. ' die() { |