summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* libuv: Update uv__fs_copy_file_range signature in cmake-bootstrap.cBrad King2021-11-171-2/+2
|
* Merge branch 'upstream-libuv' into update-libuvBrad King2021-11-1758-1256/+2005
|\ | | | | | | | | * upstream-libuv: libuv 2021-11-09 (0f696da5)
| * libuv 2021-11-09 (0f696da5)libuv upstream2021-11-1759-1256/+2012
| | | | | | | | | | | | | | | | Code extracted from: https://github.com/libuv/libuv.git at commit 0f696da5f0328dde1f9cc0372692ce22f0d17100 (v1.x).
* | libuv: Build unix tcp support during CMake bootstrapBrad King2021-11-172-17/+1
| | | | | | | | | | | | Using the real `tcp.c` simplifies `cmake-bootstrap.c`, and its implementation doesn't seem to require any of the platform-specific definitions. Also, later it will be needed for `uv_socketpair`.
* | Merge topic 'clang_windows_thinlto'Brad King2021-11-161-1/+6
|\ \ | | | | | | | | | | | | | | | | | | 3155b23260 Clang/Windows: Use ThinLTO if possible to match other platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6730
| * | Clang/Windows: Use ThinLTO if possible to match other platformsRaul Tambre2021-11-141-1/+6
| | | | | | | | | | | | Fixes #22905.
* | | Merge topic 'ci-windows'Brad King2021-11-165-5/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3d4073b129 gitlab-ci: Try upstream ninja development branch in a Windows nightly job bbb2664547 gitlab-ci: Add wix, cmake, and ninja to PATH incrementally on Windows 658009b6fe ci: Fix vcvarsall.ps1 environment variable lookup Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6732
| * | | gitlab-ci: Try upstream ninja development branch in a Windows nightly jobBrad King2021-11-153-0/+16
| | | |
| * | | gitlab-ci: Add wix, cmake, and ninja to PATH incrementally on WindowsBrad King2021-11-151-4/+5
| | | | | | | | | | | | | | | | Also run their scripts in an isolated child process.
| * | | ci: Fix vcvarsall.ps1 environment variable lookupBrad King2021-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | Previously we were relying on `VCVARSPLATFORM` and `VCVARSVERSION` powershell script variables. Read them from the environment directly.
* | | | CMake Nightly Date StampKitware Robot2021-11-161-1/+1
|/ / /
* | | Merge branch 'release-3.22'Brad King2021-11-150-0/+0
|\ \ \
| * \ \ Merge topic 'doc-tests-labels-dynamic' into release-3.22Brad King2021-11-153-5/+22
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 250acbb099 Help: Improve cross-referencing of test LABELS and related features a77bdefa3e Help: Add missing version details for Additional Test Measurements Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6726
* | \ \ \ Merge topic 'doc-tests-labels-dynamic'Brad King2021-11-153-5/+22
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 250acbb099 Help: Improve cross-referencing of test LABELS and related features a77bdefa3e Help: Add missing version details for Additional Test Measurements Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6726
| * | | | Help: Improve cross-referencing of test LABELS and related featuresCraig Scott2021-11-133-2/+12
| | | | |
| * | | | Help: Add missing version details for Additional Test MeasurementsCraig Scott2021-11-131-3/+10
| | | | |
* | | | | Merge branch 'release-3.22'Brad King2021-11-150-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'doc-gtest_discover_tests-filter' into release-3.22Brad King2021-11-151-2/+5
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 1ef54f3163 Help: Clarify meaning of filter expression in gtest_discover_tests() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6727
* | | | | Merge topic 'doc-gtest_discover_tests-filter'Brad King2021-11-151-2/+5
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 1ef54f3163 Help: Clarify meaning of filter expression in gtest_discover_tests() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6727
| * | | | Help: Clarify meaning of filter expression in gtest_discover_tests()Craig Scott2021-11-141-2/+5
| |/ / /
* | | | Merge topic 'ci-windows'Brad King2021-11-158-10/+57
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 94ae6b7872 ci: Enable FindODBC and FindOpenMP tests on Windows VS builds e731afd8b3 ci: Add VS 2019 nightly CI jobs Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6725
| * | | | ci: Enable FindODBC and FindOpenMP tests on Windows VS buildsBrad King2021-11-122-0/+10
| | | | | | | | | | | | | | | | | | | | The packages comes with the Windows SDK and/or the compiler.
| * | | | ci: Add VS 2019 nightly CI jobsBrad King2021-11-128-10/+47
| | | | | | | | | | | | | | | | | | | | | | | | | Now that the primary VS jobs have been converted to VS 2022, add nightly CI jobs to cover VS 2019.
* | | | | CMake Nightly Date StampKitware Robot2021-11-151-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2021-11-141-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2021-11-131-1/+1
|/ / /
* | | Merge branch 'release-3.22'Brad King2021-11-120-0/+0
|\ \ \ | |/ /
| * | CMake 3.22.0-rc3v3.22.0-rc3Brad King2021-11-121-1/+1
| | |
* | | Merge topic 'xcode-generation-enablegpuframecapturemode'Brad King2021-11-1211-7/+71
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0798edfb85 Tests: Xcode scheme ENABLE_GPU_FRAME_CAPTURE_MODE e09a3eddb6 Xcode: Support "GPU Frame Capture" scheme property Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6639
| * | | Tests: Xcode scheme ENABLE_GPU_FRAME_CAPTURE_MODEJake Turner2021-11-092-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting numerical value Caseless comparison of string values "Metal" is converted to value 1 "Disabled" is converted to value 3
| * | | Xcode: Support "GPU Frame Capture" scheme propertyJake Turner2021-10-199-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added XCODE_SCHEME_ENABLE_GPU_FRAME_CAPTURE_MODE variable which sets the scheme property value for "GPU Frame Capture" in the Options section by setting the Xcode project variable "enableGPUFrameCaptureMode". Example values are "Metal" (1) and "Disabled" (3). XCODE_SCHEME_ENABLE_GPU_FRAME_CAPTURE_MODE is initialized by the property CMAKE_XCODE_SCHEME_ENABLE_GPU_FRAME_CAPTURE_MODE. Implements: #22700
* | | | Merge topic 'unity-build-per-config'Brad King2021-11-128-90/+222
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 129e3c6540 Unity Build: Fix per-config sources in multi-config generators ea289314ef VS: Fix pre-VS15.8 unity build exclusion of per-config sources 53990059da cmLocalGenerator: Add dedicated types to hold unity source info de6e362a88 cmLocalGenerator: Clarify name of method to write unity source include lines 3017b3e7d4 cmLocalGenerator: Simplify unity source copy-if-different logic 0b56f92576 cmLocalGenerator: De-duplicate unity source file generation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6720
| * | | | Unity Build: Fix per-config sources in multi-config generatorsBrad King2021-11-117-31/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Single-config generators already support unity builds with per-config sources because they compute sources using `CMAKE_BUILD_TYPE` as the configuration. Each original source is either included in the unity build source, or not. Teach multi-config generators to compute the list of sources for inclusion in unity builds using all configurations. Previously they only used the empty string as the configuration. Each original source may be included in some configurations, but not others. Use preprocessor conditions to guard their inclusion when necessary. Fixes: #22892
| * | | | VS: Fix pre-VS15.8 unity build exclusion of per-config sourcesBrad King2021-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a unity build, the original source files need to be excluded from the build. Prior to VS 15.8, this is done via `ExcludeFromBuild`, which is the same mechanism used to implement per-config sources. Fix a conflict in the implementation of the two features so that unity-batched sources are excluded from all configurations rather than just those in which they would otherwise have been included.
| * | | | cmLocalGenerator: Add dedicated types to hold unity source infoBrad King2021-11-112-44/+81
| | | | |
| * | | | cmLocalGenerator: Clarify name of method to write unity source include linesBrad King2021-11-102-10/+11
| | | | |
| * | | | cmLocalGenerator: Simplify unity source copy-if-different logicBrad King2021-11-101-13/+8
| | | | |
| * | | | cmLocalGenerator: De-duplicate unity source file generationBrad King2021-11-102-40/+40
| | | | |
* | | | | Merge branch 'release-3.22'Brad King2021-11-120-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge topic 'cmp0128-fixup' into release-3.22Brad King2021-11-127-28/+47
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e47dfce75d CMP0128: Enable/disable extensions if standard same as default Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6723
* | \ \ \ \ Merge topic 'cmp0128-fixup'Brad King2021-11-127-28/+47
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e47dfce75d CMP0128: Enable/disable extensions if standard same as default Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6723
| * | | | | CMP0128: Enable/disable extensions if standard same as defaultRaul Tambre2021-11-117-28/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was intended to be part of the initial MR (!6177), but accidentally went missing when debugging nightly failures on less common systems. Noticed during !6711 review as the comment about this behaviour didn't match the code. Documentation for CMP0128 is updated to remove a false case and note the two cases related to this. Fixes #22224.
* | | | | | Merge branch 'release-3.22'Brad King2021-11-120-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'release-3.21' into release-3.22Brad King2021-11-120-0/+0
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'release-3.21'Brad King2021-11-120-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'release-3.20' into release-3.21Brad King2021-11-120-0/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'IntelLLVM-Fortran-frontend-variant' into release-3.21Brad King2021-11-111-0/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !6718
* | \ \ \ \ \ \ \ Merge branch 'release-3.20'Brad King2021-11-120-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'IntelLLVM-Fortran-frontend-variant' into release-3.20Brad King2021-11-111-0/+1
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | Merge-request: !6718
* | | | | | | | | Merge branch 'release-3.22'Brad King2021-11-120-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |