summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-sdk-selection'Brad King2023-04-0635-41/+561
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 8ecb645934 VS: Select Windows SDK matching WindowsSDKVersion env var f90c8ab54e VS: Select latest available Windows SDK version by default b512c53d43 VS: Add support for setting WindowsTargetPlatformVersion to 10.0 2f3d945f83 VS: Add CMAKE_GENERATOR_PLATFORM field to control Windows SDK selection f0a67b6291 VS: Parse comma-separated fields from CMAKE_GENERATOR_PLATFORM e259063b0a VS: Defer Windows SDK selection until CMAKE_GENERATOR_PLATFORM is known 8499374c6a VS: Simplify logic to require SDK for Windows Store 1c8d4b4bf1 Tests: Teach RunCMake_TEST_FILTER to account for test variant description Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8389
| * VS: Select Windows SDK matching WindowsSDKVersion env varBrad King2023-04-054-1/+28
| | | | | | | | | | | | | | | | | | | | In an environment established by `vcvarsall.bat` or similar, this environment variable may be set to select a Windows SDK version. If the VS generator is used in such an environment, use that SDK. This is similar to how `CMAKE_GENERATOR_INSTANCE` defaults using a `VS##0COMNTOOLS` environment variable. Fixes: #17992
| * VS: Select latest available Windows SDK version by defaultBrad King2023-04-057-4/+75
| | | | | | | | | | | | | | Add policy `CMP0149` to stop preferring SDKs exactly matching `CMAKE_SYSTEM_VERSION` over the latest SDK. Fixes: #16202
| * VS: Add support for setting WindowsTargetPlatformVersion to 10.0Brad King2023-04-053-0/+22
| | | | | | | | | | | | | | VS 2019 and above support this value to select a SDK version automatically. Fixes: #21403
| * VS: Add CMAKE_GENERATOR_PLATFORM field to control Windows SDK selectionBrad King2023-04-0522-15/+248
| | | | | | | | | | | | | | Add a `version=` field to explicitly control the SDK version selection without relying on `CMAKE_SYSTEM_VERSION`. Fixes: #16713
| * VS: Parse comma-separated fields from CMAKE_GENERATOR_PLATFORMBrad King2023-04-0510-3/+135
| |
| * VS: Defer Windows SDK selection until CMAKE_GENERATOR_PLATFORM is knownBrad King2023-04-058-8/+37
| | | | | | | | Prepare to teach `CMAKE_GENERATOR_PLATFORM` to affect SDK selection.
| * VS: Simplify logic to require SDK for Windows StoreBrad King2023-04-053-12/+14
| | | | | | | | | | | | Revise logic added by commit d7e863c1c1 (VS: Do not fail on Windows 10 with VS 2015 if no SDK is available, 2016-01-21, v3.4.3~1^2) to make the requirement decision locally and simplify signatures.
| * Tests: Teach RunCMake_TEST_FILTER to account for test variant descriptionBrad King2023-04-051-2/+6
| |
* | Merge topic 'ci-windows'Brad King2023-04-0613-111/+62
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b7400800df ci: Make python available in all Windows test jobs 99bf8418ee ci: Update to Python 3.11.3 in Windows jobs 967456423b ci: Factor out initial setup script for Windows external test jobs 3532823dd7 ci: De-duplicate Windows test script for NMake job 3f1a1bad76 ci: De-duplicate Windows test script for JOM job e2cf20e58c ci: De-duplicate Windows test script for Borland jobs 8af9a52d3e ci: De-duplicate Windows test script for MSVC v71 NMake job 430aa379d4 ci: De-duplicate Windows test script for OpenWatcom job Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8398
| * | ci: Make python available in all Windows test jobsBrad King2023-04-051-0/+1
| | | | | | | | | | | | Activate test infrastructure that requires python.
| * | ci: Update to Python 3.11.3 in Windows jobsBrad King2023-04-053-42/+31
| | | | | | | | | | | | | | | Use the official embedded distribution `.zip` files, but put copies at URLs we control.
| * | ci: Factor out initial setup script for Windows external test jobsBrad King2023-04-051-1/+4
| | | | | | | | | | | | | | | | | | On Linux and macOS we use the "before script" for both build and test jobs. On Windows we only want a subset of it, but give it a dedicated helper for consistency.
| * | ci: De-duplicate Windows test script for NMake jobBrad King2023-04-053-11/+2
| | | | | | | | | | | | Move job-specific setup to an environment script.
| * | ci: De-duplicate Windows test script for JOM jobBrad King2023-04-053-14/+5
| | | | | | | | | | | | Move job-specific setup to an environment script.
| * | ci: De-duplicate Windows test script for Borland jobsBrad King2023-04-055-14/+7
| | | | | | | | | | | | Move job-specific setup to environment scripts.
| * | ci: De-duplicate Windows test script for MSVC v71 NMake jobBrad King2023-04-053-12/+3
| | | | | | | | | | | | Move job-specific setup to an environment script.
| * | ci: De-duplicate Windows test script for OpenWatcom jobBrad King2023-04-054-17/+9
| | | | | | | | | | | | Move job-specific setup to an environment script.
* | | Merge topic 'FindOpenSSL-mingw'Brad King2023-04-061-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 248689f9bf FindOpenSSL: Fix finding header files and static libraries on MinGW Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8394
| * | | FindOpenSSL: Fix finding header files and static libraries on MinGWمهدي شينون (Mehdi Chinoune)2023-04-051-2/+2
| |/ / | | | | | | | | | | | | | | | | | | * Avoid searching in the `Program Files` folder because the official OpenSSL is built for the MSVC ABI, and so is not compatible with MinGW. * Static libraries on MinGW has `.a` extension.
* | | Merge branch 'release-3.26'Brad King2023-04-060-0/+0
|\ \ \
| * \ \ Merge topic 'doc-typo' into release-3.26Brad King2023-04-061-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 045fbbb47c Help: Remove duplicated word in COMPILE_OPTIONS target property docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8396
* | \ \ \ Merge topic 'doc-typo'Brad King2023-04-061-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 045fbbb47c Help: Remove duplicated word in COMPILE_OPTIONS target property docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8396
| * | | | Help: Remove duplicated word in COMPILE_OPTIONS target property docsBrad King2023-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | Fixes: #24673
* | | | | Merge branch 'release-3.26'Brad King2023-04-060-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'FindCUDAToolkit-nvptxcompiler_static-deps' into release-3.26Brad King2023-04-061-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8711231739 FindCUDAToolkit: nvptxcompiler_static correctly specify dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8395
* | \ \ \ \ Merge topic 'FindCUDAToolkit-nvptxcompiler_static-deps'Brad King2023-04-061-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 8711231739 FindCUDAToolkit: nvptxcompiler_static correctly specify dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8395
| * | | | | FindCUDAToolkit: nvptxcompiler_static correctly specify dependenciesRobert Maynard2023-04-051-1/+1
| | |/ / / | |/| | | | | | | | | | | | | Avoids linking to `Threads::Threads` on non-unix systems where it isn't needed. In addition ensures that dlopen symbols are resolved.
* | | | | Merge branch 'release-3.26'Brad King2023-04-060-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'FindCUDAToolkit-cusparse-deps' into release-3.26Brad King2023-04-061-6/+9
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 516d807423 FindCUDAToolkit: Add dependency between cusparse and nvJitLink Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8397
* | | | | Merge topic 'FindCUDAToolkit-cusparse-deps'Brad King2023-04-061-6/+9
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 516d807423 FindCUDAToolkit: Add dependency between cusparse and nvJitLink Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8397
| * | | | FindCUDAToolkit: Add dependency between cusparse and nvJitLinkRobert Maynard2023-04-051-6/+9
| |/ / / | | | | | | | | | | | | Starting in CUDA 12.0 cusparse uses nvJitLink. As part of verifying this PR I also corrected the nvJitLink dependencies
* | | | CMake Nightly Date StampKitware Robot2023-04-061-1/+1
| |/ / |/| |
* | | CMake Nightly Date StampKitware Robot2023-04-051-1/+1
| | |
* | | Merge branch 'release-3.26'Brad King2023-04-041-2/+2
|\ \ \ | |/ /
| * | CMake 3.26.3v3.26.3Brad King2023-04-042-3/+3
| | |
* | | Merge branch 'release-3.26'Brad King2023-04-040-0/+0
|\ \ \ | |/ /
| * | Merge branch 'release-3.25' into release-3.26Brad King2023-04-040-0/+0
| |\ \
| * \ \ Merge topic 'test-xcode-14.3' into release-3.26Brad King2023-04-041-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 3bb46b29fd Tests: Teach RunCMake to ignore Xcode DVTCoreDeviceEnabledState warnings Merge-request: !8392
* | \ \ \ Merge branch 'release-3.25'Brad King2023-04-040-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'release-3.24' into release-3.25Brad King2023-04-040-0/+0
| |\ \ \ \
| * \ \ \ \ Merge branch 'test-xcode-14.3' into release-3.25Brad King2023-04-041-0/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | Merge-request: !8392
* | | | | | Merge branch 'release-3.24'Brad King2023-04-040-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'release-3.23' into release-3.24Brad King2023-04-040-0/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'test-xcode-14.3' into release-3.24Brad King2023-04-041-0/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | Merge-request: !8392
* | | | | | | Merge branch 'release-3.23'Brad King2023-04-040-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch 'test-xcode-14.3' into release-3.23Brad King2023-04-041-0/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | Merge-request: !8392
* | | | | | | Merge topic 'test-xcode-14.3'Brad King2023-04-041-0/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 3bb46b29fd Tests: Teach RunCMake to ignore Xcode DVTCoreDeviceEnabledState warnings Merge-request: !8392
| * | | | | | Tests: Teach RunCMake to ignore Xcode DVTCoreDeviceEnabledState warningsBrad King2023-04-041-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some Xcode versions, `xcodebuild` may warn: ... xcodebuild[...] DVTCoreDeviceEnabledState: DVTCoreDeviceEnabledState_Disabled set via user default Teach RunCMake to drop such incidental lines before matching against expected output.
* | | | | | Merge topic 'FindBLAS-LAPACK-vendor-var'Brad King2023-04-042-8/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9d18426c47 Find{BLAS,LAPACK}: Prefer BLA_VENDOR cmake variable over env variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8387
generated by cgit v0.12 at 2025-02-13 14:01:06 (GMT)