CMake merge requestshttps://gitlab.kitware.com/cmake/cmake/-/merge_requests2019-10-30T10:20:11-04:00https://gitlab.kitware.com/cmake/cmake/-/merge_requests/3939Help: Fix COMPILE_LANG_AND_ID genex example2019-10-30T10:20:11-04:00Brad KingHelp: Fix COMPILE_LANG_AND_ID genex exampleFix the `COMPILE_LANGUAGE/CXX_COMPILER_ID` variant of the example to have the same meaning as the `COMPILE_LANG_AND_ID` variant. The inconsistency was introduced by !3405.
Fixes: #19862Fix the `COMPILE_LANGUAGE/CXX_COMPILER_ID` variant of the example to have the same meaning as the `COMPILE_LANG_AND_ID` variant. The inconsistency was introduced by !3405.
Fixes: #198623.15.5Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/3909IRSL: Install vcruntime140_1.dll if available2019-10-30T10:19:54-04:00Brad KingIRSL: Install vcruntime140_1.dll if availableVS 2019 now distributes this additional runtime DLL with its `14.2x` toolsets.
Fixes: #19829VS 2019 now distributes this additional runtime DLL with its `14.2x` toolsets.
Fixes: #198293.15.5Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/3908VS: Add toolset v142 CSharp flag table2019-10-30T10:19:37-04:00Brad KingVS: Add toolset v142 CSharp flag tableWhile the flag tables for C and C++ were generated from MSBuild `.xml`
files, the CSharp flag tables were written by hand. Copy the `v141`
flag table to use for the `v142` toolset.
Remove the special case added by !2856 that mapped the...While the flag tables for C and C++ were generated from MSBuild `.xml`
files, the CSharp flag tables were written by hand. Copy the `v141`
flag table to use for the `v142` toolset.
Remove the special case added by !2856 that mapped the v142 flag table lookup to v141 since we now have the real v142 table.
Fixes: #198283.15.5Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/3896VS: Tell VS 16.4 not to verify CMake-provided custom command outputs2019-10-30T10:19:13-04:00Brad KingVS: Tell VS 16.4 not to verify CMake-provided custom command outputsExtend the fix from !3860 to apply to outputs in CMake-provided targets like `install`. Simply mark these outputs as `SYMBOLIC` too since they are not actually generated.
Fixes: #19737Extend the fix from !3860 to apply to outputs in CMake-provided targets like `install`. Simply mark these outputs as `SYMBOLIC` too since they are not actually generated.
Fixes: #197373.15.5Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/3878Xcode: Restore CMAKE_XCODE_GENERATE_SCHEME for custom targets2019-10-30T10:18:49-04:00Brad KingXcode: Restore CMAKE_XCODE_GENERATE_SCHEME for custom targetsThe target property introduced by !3098 was accidentally not initialized by `CMAKE_XCODE_GENERATE_SCHEME` for custom targets. Fix it and update the test.
Fixes: #19759The target property introduced by !3098 was accidentally not initialized by `CMAKE_XCODE_GENERATE_SCHEME` for custom targets. Fix it and update the test.
Fixes: #197593.15.5Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/3874VS: Fix support for v142 toolset minor versions2019-12-12T11:36:33-05:00Brad KingVS: Fix support for v142 toolset minor versionsWhen using `-T v142,version=14.22` the `.props` file location is
different starting with version `14.20` than it was in `14.16` and
below. Adapt the path based on the version.
Fixes: #19779When using `-T v142,version=14.22` the `.props` file location is
different starting with version `14.20` than it was in `14.16` and
below. Adapt the path based on the version.
Fixes: #197793.15.5Brad KingBrad King