summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge topic 'nmc-reuse-from'Brad King2021-11-091-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 244550997f PCH: Fixed Ninja Multi-Config and REUSE_FROM for MSVC Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6713
| * | | | | | | | | | PCH: Fixed Ninja Multi-Config and REUSE_FROM for MSVCCristian Adam2021-11-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The copy_idb_pdb.cmake script would be executed for every configuration for all configurations. Debug would still want to get the RelWithDebInfo files, and the other way around.
* | | | | | | | | | | Merge topic 'msvc-pch-reuse-config'Brad King2021-11-091-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95fa27d94d PCH: Fix REUSE_FROM when Debug and RelWithDebInfo configs differ Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6712
| * | | | | | | | | | PCH: Fix REUSE_FROM when Debug and RelWithDebInfo configs differCristian Adam2021-11-081-2/+2
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the Debug configuration contains `/ZI` but the RelWithDebInfo doesn't then the copy_pdb_idb.cmake script will cause problems due to the fact that it was common for both configurations but they are incompatible with each other.
* | | | | | | | | | CMake Nightly Date StampKitware Robot2021-11-091-1/+1
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge topic 'cpack-drop-osxx11'Brad King2021-11-085-437/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ef974e6cb CPack: Remove undocumented deprecated OSXX11 generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6704
| * | | | | | | | | CPack: Remove undocumented deprecated OSXX11 generatorBrad King2021-11-055-437/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CPack generator was never documented, and has been deprecated since commit 2ed00e8ef8 (CPack: Deprecate OSXX11 generator, 2020-01-31, v3.17.0-rc1~45^2). Issue: #20235
* | | | | | | | | | Merge topic 'vs-framework-version'Brad King2021-11-085-39/+124
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d51246c662 VS: Default TargetFrameworkVersion to v4.7.2 for VS 2022 f97f8537f3 VS: Model a default target framework e40cedddc0 cmVisualStudio10TargetGenerator: Refactor target framework selection 78782cc7dc cmGlobalVisualStudio8Generator: Refactor SetGeneratorPlatform Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6699
| * | | | | | | | | VS: Default TargetFrameworkVersion to v4.7.2 for VS 2022Brad King2021-11-061-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSBuild defaults to v4.0 but VS 2022 does not install it anymore. Explicitly specify a newer framework version by default. Use a version that VS 2022 installs without selecting a separate component. Fixes: #22835
| * | | | | | | | | VS: Model a default target frameworkBrad King2021-11-064-10/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add fields to the VS generator to select a target framework. Migrate the existing default for VS 12 .NET CF for Windows CE. Report the values in `CMAKE_VS_*` variables and use them for the CSharp compiler id project too. Issue: #22849
| * | | | | | | | | cmVisualStudio10TargetGenerator: Refactor target framework selectionBrad King2021-11-061-35/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split the selection from the generation of the resulting element(s).
| * | | | | | | | | cmGlobalVisualStudio8Generator: Refactor SetGeneratorPlatformBrad King2021-11-031-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-organize the method to make room for additional `CMAKE_GENERATOR_PLATFORM` processing.
* | | | | | | | | | CMake Nightly Date StampKitware Robot2021-11-081-1/+1
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2021-11-071-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2021-11-061-1/+1
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge topic 'nmc-cross-config-target-deps'Brad King2021-11-056-13/+21
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95f44e00cd Ninja Multi-Config: Fix custom command target dependencies in cross-configs a883363935 Ninja Multi-Config: Fix internal cross-config target dependency ordering 16e24748c5 Ninja Multi-Config: Fix cross-config custom command dependency tracing Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6702
| * | | | | | | Ninja Multi-Config: Fix custom command target dependencies in cross-configsBrad King2021-11-041-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generator expressions in a non-cross custom command's `COMMAND` arguments are evaluated in the command config. Target-level dependencies implied by `TARGET_FILE` must therefore be cross dependencies. This is important to generate proper target-level dependencies on the cross-config build statements for the target to which the custom command is attached. Fixes: #22855
| * | | | | | | Ninja Multi-Config: Fix internal cross-config target dependency orderingBrad King2021-11-041-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 7abc3d61ac (Ninja Multi-Config: Fix issue with framework dependencies and Autogen, 2020-02-13, v3.17.0-rc2~18^2) the `cmLinkItem` comparison operator was updated to order identical strings by the cross-config boolean. We need to order identical targets that way too in order to represent both a cross and non-cross dependency on the same target. Issue: #22855
| * | | | | | | Ninja Multi-Config: Fix cross-config custom command dependency tracingBrad King2021-11-044-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Process `CMAKE_CROSS_CONFIGS` and friends to properly configure the generator for cross-config behavior before custom command dependency tracing.
| * | | | | | | Merge topic 'msvc-cxx-modules-scanDependencies' into release-3.22Brad King2021-11-041-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ed1d7bee6 cmScanDepFormat: Accept P1689r4 files with version 1 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6696
* | \ \ \ \ \ \ \ Merge topic 'source-cleanup'Brad King2021-11-0529-122/+90
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b86b6aaa4a Source: Cleanup and simplify some code Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6673
| * | | | | | | | | Source: Cleanup and simplify some codeRose2021-11-0429-122/+90
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2021-11-051-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge topic 'msvc-cxx-modules-scanDependencies'Brad King2021-11-041-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ed1d7bee6 cmScanDepFormat: Accept P1689r4 files with version 1 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6696
| * | | | | | | | | cmScanDepFormat: Accept P1689r4 files with version 1Brad King2021-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS 2022's `cl` 19.30 has a `-scanDependencies` option that produces the P1689r4 format. It reports the "version" field with value "1".
| * | | | | | | | | CMake 3.21.4v3.21.4Brad King2021-10-271-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'fix-ifdef-windows' into release-3.21Brad King2021-10-154-4/+4
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | Merge-request: !6631
* | | | | | | | | | Merge topic 'ninja-pdb-dir'Brad King2021-11-042-3/+3
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 73b84db62d Ninja: Fix creation of Windows import library directory bd36735f65 cmNinjaTargetGenerator: Replace "their" with "there" in comment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6694
| * | | | | | | | | Ninja: Fix creation of Windows import library directoryBrad King2021-11-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call `EnsureParentDirectoryExists` with our internal representation of the path, not the representation quoted/encoded for Ninja. Fixes: #22841
| * | | | | | | | | cmNinjaTargetGenerator: Replace "their" with "there" in commentBrad King2021-11-031-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2021-11-041-1/+1
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge topic 'C++-headers'Brad King2021-11-0321-36/+26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6f4727aaa0 Source: Replace C headers with C++ ones Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6657
| * | | | | | | | Source: Replace C headers with C++ onesRose2021-11-0221-36/+26
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | In applicable areas only, of course.
* | | | | | | | CMake Nightly Date StampKitware Robot2021-11-031-1/+1
|/ / / / / / /
* | | | | | | Merge topic 'support_nvcc_native_flag'Brad King2021-11-021-3/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 14d8a2768d CUDA: Support nvcc 11.5 new -arch=all|all-major flags Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !6652
| * | | | | | | CUDA: Support nvcc 11.5 new -arch=all|all-major flagsRobert Maynard2021-11-011-3/+16
| | | | | | | |
* | | | | | | | Merge topic 'update-kwsys'Brad King2021-11-022-10/+106
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 37c2f722fc find_program: Explicitly skip WindowsApps/python*.exe app installer links d8b5b0c7e4 Merge branch 'upstream-KWSys' into update-kwsys e9ab6eeeb5 KWSys 2021-11-01 (572f2a65) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6679
| * | | | | | | | find_program: Explicitly skip WindowsApps/python*.exe app installer linksBrad King2021-11-011-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows provide a "python" executable like this: %USERPROFILE%\AppData\Local\Microsoft\WindowsApps\python.exe It is actually a Windows app exec link. If it points to an app installer, avoid mistaking it for a working Python.
| * | | | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2021-11-011-10/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2021-11-01 (572f2a65)
* | | | | | | | | CMake Nightly Date StampKitware Robot2021-11-021-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'vs-instance'Brad King2021-11-014-53/+245
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 195d47e213 VS: Allow CMAKE_GENERATOR_INSTANCE to specify portable instance ec8d37b3b1 VS: Support version specification in CMAKE_GENERATOR_INSTANCE 8e6d930e8c VS: Parse comma-separated fields from CMAKE_GENERATOR_INSTANCE 5d1f377737 cmVSSetupHelper: Factor out helper to load MSVC toolset version 006fe1e919 cmVSSetupHelper: Convert wide to narrow strings early f5dfc788b8 cmVSSetupHelper: Drop unused InstanceId field 3213e2595d cmVSSetupHelper: Drop unused ullVersion field 152f9978dd Help: De-duplicate VS instance selection documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6651
| * | | | | | | | | VS: Allow CMAKE_GENERATOR_INSTANCE to specify portable instanceBrad King2021-10-293-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the `CMAKE_GENERATOR_INSTANCE` value was used only to filter the instances reported by the Visual Studio Installer tool. If the specified install location is not known to the VS Installer, but the user provided a `version=` field, check for the installation directly on disk. Fixes: #21639, #22197
| * | | | | | | | | VS: Support version specification in CMAKE_GENERATOR_INSTANCEBrad King2021-10-294-9/+79
| | | | | | | | | |
| * | | | | | | | | VS: Parse comma-separated fields from CMAKE_GENERATOR_INSTANCEBrad King2021-10-292-2/+92
| | | | | | | | | |
| * | | | | | | | | cmVSSetupHelper: Factor out helper to load MSVC toolset versionBrad King2021-10-291-16/+26
| | | | | | | | | |
| * | | | | | | | | cmVSSetupHelper: Convert wide to narrow strings earlyBrad King2021-10-292-14/+13
| | | | | | | | | |
| * | | | | | | | | cmVSSetupHelper: Drop unused InstanceId fieldBrad King2021-10-292-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minimize the amount of information needed about a VS instance.
| * | | | | | | | | cmVSSetupHelper: Drop unused ullVersion fieldBrad King2021-10-292-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The field has not been used since commit 3fd65f5ca6 (VS: Compare VS instance versions as strings, 2021-06-17, v3.21.0-rc1~11^2~1).
* | | | | | | | | | Merge topic 'envmod-test-modifying-existing'Brad King2021-11-011-1/+17
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c4d6404eb Tests/Environment: also test modifying ambient values 7d52d48a32 cmCTestRunTest: get the default value from the environment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6682
| * | | | | | | | | cmCTestRunTest: get the default value from the environmentBen Boeckel2021-10-291-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only works due to some assumptions about how the `ENVIRONMENT` property is processed. Comments have been added to notify anyone modifying the behavior about where to look. Fixes: #22819
generated by cgit v0.12 at 2025-02-12 05:50:35 (GMT)