mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-22 06:59:01 -06:00
Code Issues Packages Projects Releases Wiki Activity
55,362 Commits 2 Branches 391 Tags
80eae52410715b5caef6b581b631ada3d2b3a831
Commit Graph

55362 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
80eae52410 Merge topic 'test-target_link_directories-chars' 
7aa0c129ba Tests: Fix CMakeCommands.target_link_directories for regex chars in path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6733
 2021-11-17 08:45:35 -05:00
Brad King
a2da527a07 Merge branch 'release-3.22' 2021-11-17 08:44:29 -05:00
Brad King
908d2cd136 Merge topic 'gtest_discover_tests-PRE_TEST-dep' 
1bf6d5979d gtest_discover_tests: Re-run PRE_TEST discovery on any arg change
715af43124 Tests: Fix and update wrongly named GoogleTest stdout file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6728
 2021-11-17 08:44:29 -05:00
Brad King
ed9b971694 Merge topic 'gtest_discover_tests-PRE_TEST-dep' into release-3.22 
1bf6d5979d gtest_discover_tests: Re-run PRE_TEST discovery on any arg change
715af43124 Tests: Fix and update wrongly named GoogleTest stdout file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6728
 2021-11-17 08:44:28 -05:00
Kitware Robot
d2e10c4d8d CMake Nightly Date Stamp 2021-11-17 00:01:10 -05:00
WenGe Wang
7aa0c129ba Tests: Fix CMakeCommands.target_link_directories for regex chars in path 
Fixes: #22801
 2021-11-16 11:19:47 -05:00
Craig Scott
1bf6d5979d gtest_discover_tests: Re-run PRE_TEST discovery on any arg change 
Fixes: #22912
 2021-11-16 09:45:26 -05:00
Brad King
d98b61c687 Merge topic 'clang_windows_thinlto' 
3155b23260 Clang/Windows: Use ThinLTO if possible to match other platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6730
 2021-11-16 09:06:10 -05:00
Brad King
696edd1704 Merge topic 'ci-windows' 
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
 2021-11-16 09:04:45 -05:00
Kitware Robot
49c870b38f CMake Nightly Date Stamp 2021-11-16 00:01:53 -05:00
Brad King
3d4073b129 gitlab-ci: Try upstream ninja development branch in a Windows nightly job 2021-11-15 10:24:32 -05:00
Brad King
bbb2664547 gitlab-ci: Add wix, cmake, and ninja to PATH incrementally on Windows 
Also run their scripts in an isolated child process.
 2021-11-15 10:24:32 -05:00
Brad King
658009b6fe ci: Fix vcvarsall.ps1 environment variable lookup 
Previously we were relying on `VCVARSPLATFORM` and `VCVARSVERSION`
powershell script variables.  Read them from the environment directly.
 2021-11-15 10:24:32 -05:00
Brad King
7418866d4d Merge branch 'release-3.22' 2021-11-15 09:24:42 -05:00
Brad King
39624cc911 Merge topic 'doc-tests-labels-dynamic' 
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
 2021-11-15 09:24:42 -05:00
Brad King
40ae565832 Merge topic 'doc-tests-labels-dynamic' into release-3.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
 2021-11-15 09:24:41 -05:00
Brad King
acc3d6bbf1 Merge branch 'release-3.22' 2021-11-15 09:21:52 -05:00
Brad King
3376f83889 Merge topic 'doc-gtest_discover_tests-filter' 
1ef54f3163 Help: Clarify meaning of filter expression in gtest_discover_tests()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6727
 2021-11-15 09:21:52 -05:00
Brad King
ca4b81d69f Merge topic 'doc-gtest_discover_tests-filter' into release-3.22 
1ef54f3163 Help: Clarify meaning of filter expression in gtest_discover_tests()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6727
 2021-11-15 09:21:51 -05:00
Brad King
62db7769a8 Merge topic 'ci-windows' 
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
 2021-11-15 09:18:39 -05:00
Kitware Robot
6d945a5235 CMake Nightly Date Stamp 2021-11-15 00:05:23 -05:00
Raul Tambre
3155b23260 Clang/Windows: Use ThinLTO if possible to match other platforms 
Fixes #22905.
 2021-11-14 15:05:25 +02:00
Craig Scott
715af43124 Tests: Fix and update wrongly named GoogleTest stdout file 
The GoogleTest-skip-test output was never being checked since this
test was added due to this file having the wrong name.
 2021-11-14 17:55:49 +11:00
Craig Scott
1ef54f3163 Help: Clarify meaning of filter expression in gtest_discover_tests() 2021-11-14 16:49:23 +11:00
Kitware Robot
b31e60e76d CMake Nightly Date Stamp 2021-11-14 00:01:07 -05:00
Craig Scott
250acbb099 Help: Improve cross-referencing of test LABELS and related features 2021-11-13 20:45:05 +11:00
Craig Scott
a77bdefa3e Help: Add missing version details for Additional Test Measurements 2021-11-13 20:44:05 +11:00
Kitware Robot
c73063ad13 CMake Nightly Date Stamp 2021-11-13 00:02:15 -05:00
Brad King
94ae6b7872 ci: Enable FindODBC and FindOpenMP tests on Windows VS builds 
The packages comes with the Windows SDK and/or the compiler.
 2021-11-12 11:13:00 -05:00
Brad King
e731afd8b3 ci: Add VS 2019 nightly CI jobs 
Now that the primary VS jobs have been converted to VS 2022,
add nightly CI jobs to cover VS 2019.
 2021-11-12 11:06:17 -05:00
Brad King
7315cd65da Merge branch 'release-3.22' 2021-11-12 10:09:53 -05:00
Brad King
fed67fa40d CMake 3.22.0-rc3 v3.22.0-rc3 2021-11-12 09:15:07 -05:00
Brad King
7a149034f7 Merge topic 'xcode-generation-enablegpuframecapturemode' 
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
 2021-11-12 09:05:01 -05:00
Brad King
ea5d3f4d4c Merge topic 'unity-build-per-config' 
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
 2021-11-12 09:03:39 -05:00
Brad King
ad6da2d83f Merge branch 'release-3.22' 2021-11-12 09:02:41 -05:00
Brad King
648b66a1d3 Merge topic 'cmp0128-fixup' 
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
 2021-11-12 09:02:41 -05:00
Brad King
9740573673 Merge topic 'cmp0128-fixup' into release-3.22 
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
 2021-11-12 09:02:40 -05:00
Brad King
9f6c91eb30 Merge branch 'release-3.22' 2021-11-12 09:00:30 -05:00
Brad King
7276a02ab5 Merge branch 'release-3.21' 2021-11-12 09:00:26 -05:00
Brad King
bb92b178c8 Merge branch 'release-3.20' 2021-11-12 09:00:23 -05:00
Brad King
5154dd2450 Merge branch 'release-3.21' into release-3.22 2021-11-12 09:00:05 -05:00
Brad King
bb48c75817 Merge branch 'release-3.20' into release-3.21 2021-11-12 08:59:43 -05:00
Brad King
44f70379d1 Merge branch 'release-3.22' 2021-11-12 08:58:58 -05:00
Brad King
180e14abc7 Merge topic 'IntelLLVM-Fortran-frontend-variant' 
b1edd6e7c7 Fortran: Save frontend variant persistently for IntelLLVM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6718
 2021-11-12 08:58:58 -05:00
Brad King
c1fe4f68e4 Merge topic 'IntelLLVM-Fortran-frontend-variant' into release-3.22 
b1edd6e7c7 Fortran: Save frontend variant persistently for IntelLLVM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6718
 2021-11-12 08:58:57 -05:00
Brad King
dd0c9f92f2 Merge branch 'release-3.22' 2021-11-12 08:55:15 -05:00
Brad King
031ba22de2 Merge topic 'ti-armcl-unknown-arg-warning' into release-3.22 
220f78e253 TI: Recognize invalid compiler option warning during try_compile()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6705
 2021-11-12 08:55:14 -05:00
Brad King
3ac8ea7696 Merge topic 'ti-armcl-unknown-arg-warning' 
220f78e253 TI: Recognize invalid compiler option warning during try_compile()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6705
 2021-11-12 08:55:14 -05:00
Brad King
8f32e873b1 Merge branch 'release-3.22' 2021-11-12 08:53:22 -05:00
Brad King
0e46026d19 Merge topic 'ci-vs2022' 
0e6bdb90e5 Merge branch 'backport-3.22-ci-vs2022' into ci-vs2022
b63a87582f gitlab-ci: Update Windows jobs to VS 2022
190d2b5d55 gitlab-ci: Update Windows jobs to VS 2022
ac32794983 gitlab-ci: Re-organize Windows job tags
39bdb1e332 gitlab-ci: Re-organize Windows job tags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6724
 2021-11-12 08:53:22 -05:00