Merge topic 'extend_toolchain_flag_to_cmake_preset'
a9b968bb cmake-presets: Introduce `toolchainFile` preset option Acked-by:Kitware Robot <kwrobot@kitware.com> Merge-request: !6045
Showing
- Help/manual/cmake-presets.7.rst 8 additions, 0 deletionsHelp/manual/cmake-presets.7.rst
- Help/manual/presets/schema.json 5 additions, 0 deletionsHelp/manual/presets/schema.json
- Source/cmCMakePresetsFile.cxx 10 additions, 0 deletionsSource/cmCMakePresetsFile.cxx
- Source/cmCMakePresetsFile.h 2 additions, 0 deletionsSource/cmCMakePresetsFile.h
- Source/cmCMakePresetsFileReadJSON.cxx 7 additions, 0 deletionsSource/cmCMakePresetsFileReadJSON.cxx
- Source/cmake.cxx 7 additions, 0 deletionsSource/cmake.cxx
- Tests/RunCMake/CMakePresets/FuturePresetToolchainField-result.txt 1 addition, 0 deletions...nCMake/CMakePresets/FuturePresetToolchainField-result.txt
- Tests/RunCMake/CMakePresets/FuturePresetToolchainField-stderr.txt 2 additions, 0 deletions...nCMake/CMakePresets/FuturePresetToolchainField-stderr.txt
- Tests/RunCMake/CMakePresets/FuturePresetToolchainField.json.in 11 additions, 0 deletions.../RunCMake/CMakePresets/FuturePresetToolchainField.json.in
- Tests/RunCMake/CMakePresets/GoodToolchain.json.in 30 additions, 0 deletionsTests/RunCMake/CMakePresets/GoodToolchain.json.in
- Tests/RunCMake/CMakePresets/GoodToolchainCommandLine.cmake 3 additions, 0 deletionsTests/RunCMake/CMakePresets/GoodToolchainCommandLine.cmake
- Tests/RunCMake/CMakePresets/GoodToolchainDefault.cmake 3 additions, 0 deletionsTests/RunCMake/CMakePresets/GoodToolchainDefault.cmake
- Tests/RunCMake/CMakePresets/GoodToolchainInherit.cmake 3 additions, 0 deletionsTests/RunCMake/CMakePresets/GoodToolchainInherit.cmake
- Tests/RunCMake/CMakePresets/GoodToolchainOverride.cmake 3 additions, 0 deletionsTests/RunCMake/CMakePresets/GoodToolchainOverride.cmake
- Tests/RunCMake/CMakePresets/RunCMakeTest.cmake 34 additions, 2 deletionsTests/RunCMake/CMakePresets/RunCMakeTest.cmake
Loading
Please register or sign in to comment