mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 06:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity
59,915 Commits 2 Branches 385 Tags
f8107e7c6bc007d6b00a2ba11dfd685a4606824a
Commit Graph

59915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
f8107e7c6b Merge branch 'release-3.25' 2022-11-14 12:53:50 -05:00
Brad King
05dcc98578 Merge branch 'release-3.24' 2022-11-14 12:53:48 -05:00
Brad King
dc034393be Merge branch 'release-3.23' 2022-11-14 12:53:41 -05:00
Brad King
3555265f1d Merge branch 'release-3.24' into release-3.25 2022-11-14 12:17:27 -05:00
Brad King
8ad8c4432f Merge branch 'release-3.23' into release-3.24 2022-11-14 12:17:21 -05:00
Brad King
7f51a044d9 Merge branch 'compile-msvc-14.34-c++20' into release-3.25 
Merge-request: !7910
 2022-11-14 12:17:02 -05:00
Brad King
3e0ccd6469 Merge branch 'compile-msvc-14.34-c++20' into release-3.24 
Merge-request: !7910
 2022-11-14 12:16:46 -05:00
Brad King
2ac207f046 Merge branch 'compile-msvc-14.34-c++20' into release-3.23 
Merge-request: !7910
 2022-11-14 12:16:27 -05:00
Werner, Joerg
a394c9416d cmGlobalVisualStudioGenerator: Fix compiling as C++20 in VS 2022 
Adding missing narrow string conversion.

This backports commit f3c918ef1b (cmGlobalVisualStudioGenerator: Fix
compiling as C++20 in VS 2022, 2022-10-20, v3.25.0-rc3~31^2) to the
CMake 3.23 and 3.24 branches.

Fixes: #24162
 2022-11-14 12:07:16 -05:00
Brad King
7a4673965f Merge topic 'nvcc-isystem' 
207fd956d8 CUDA: Use consistent -isystem flag style for NVIDIA nvcc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7904
 2022-11-14 10:32:32 -05:00
Brad King
0e2a73fefd Merge topic 'profile-genex' 
4d70a94545 Profiling: Profile genex evaluation
09d7f947d6 cmGeneratorExpression: Require cmake instance
553794e987 cmake::CreateProfilingEntry: Refactor to take lambda for args

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: alcroito <alexandru.croitor@qt.io>
Merge-request: !7898
 2022-11-14 10:25:01 -05:00
Brad King
4bf832086a Merge topic 'ci-windows-arm64' 
09c1b1db07 gitlab-ci: Add windows-arm64 native jobs for Ninja and VS
61ebd7d083 ci: Download cmake on windows-arm64
93a5d89b42 ci: Teach cmake download script on Windows to branch on host architecture
1ccffcf0ea ci: Factor out helper to load python into environment on Windows
781303c0e2 ci: Factor out helper to load qt into environment on Windows
b0d16c7f74 Tests: Fix CTest.UpdateGIT under repo-local defaultBranch config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !7905
 2022-11-14 10:20:32 -05:00
Brad King
e683a428f6 Merge branch 'release-3.25' 2022-11-14 10:18:21 -05:00
Brad King
38c8866dd1 Merge topic 'msvc-19.34-cpp-modules' 
0e9782b336 msvc: bless MSVC 19.34 support for C++ modules as experimental

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7745
 2022-11-14 10:18:21 -05:00
Brad King
d41243efc9 Merge topic 'msvc-19.34-cpp-modules' into release-3.25 
0e9782b336 msvc: bless MSVC 19.34 support for C++ modules as experimental

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7745
 2022-11-14 10:18:20 -05:00
Brad King
401bfe46f1 Merge branch 'release-3.25' 2022-11-14 10:15:56 -05:00
Brad King
6495e7e555 Merge topic 'iar-asm-archid' 
f9ff6ab2d1 IAR: Fix ASM compiler architecture detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7903
 2022-11-14 10:15:56 -05:00
Brad King
7e3389ce42 Merge topic 'iar-asm-archid' into release-3.25 
f9ff6ab2d1 IAR: Fix ASM compiler architecture detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7903
 2022-11-14 10:15:55 -05:00
Kitware Robot
f3d2e3f95d CMake Nightly Date Stamp 2022-11-14 00:01:22 -05:00
Kitware Robot
168b82e68b CMake Nightly Date Stamp 2022-11-13 00:01:08 -05:00
Kitware Robot
2b99ae0324 CMake Nightly Date Stamp 2022-11-12 00:01:11 -05:00
Ben Boeckel
0e9782b336 msvc: bless MSVC 19.34 support for C++ modules as experimental 
Visual Studio 17.4 now contains official support for what CMake needs.
 2022-11-11 16:54:05 -05:00
Brad King
09c1b1db07 gitlab-ci: Add windows-arm64 native jobs for Ninja and VS 
Add Windows ARM64 native CI jobs to build and test with Ninja,
and to test with VS.

Issue: #23624
 2022-11-11 15:05:30 -05:00
Brad King
61ebd7d083 ci: Download cmake on windows-arm64 2022-11-11 15:05:30 -05:00
Brad King
93a5d89b42 ci: Teach cmake download script on Windows to branch on host architecture 2022-11-11 15:05:30 -05:00
Brad King
1ccffcf0ea ci: Factor out helper to load python into environment on Windows 2022-11-11 15:05:30 -05:00
Brad King
781303c0e2 ci: Factor out helper to load qt into environment on Windows 2022-11-11 15:05:30 -05:00
Brad King
b0d16c7f74 Tests: Fix CTest.UpdateGIT under repo-local defaultBranch config 
The default branch detection added by commit 26ec2e2b0c (Tests: Update
CTest.UpdateGIT test for custom defaultBranch, 2020-12-02,
v3.20.0-rc1~355^2) fails if the test is run inside a Git work tree whose
`.git` directory configures a `defaultBranch` that is different from the
global or system-wide value.  Fix the detection to ignore the locally
configured value so that we match the `git init` decision.
 2022-11-11 15:05:01 -05:00
Kyle Edwards
4d70a94545 Profiling: Profile genex evaluation 2022-11-11 12:29:41 -05:00
Kyle Edwards
09d7f947d6 cmGeneratorExpression: Require cmake instance 2022-11-11 12:29:41 -05:00
YantaoZhao
207fd956d8 CUDA: Use consistent -isystem flag style for NVIDIA nvcc 
Replace `-isystem=` with `-isystem ` for consistency with other compilers.

Fixes: #24154
 2022-11-11 12:19:41 -05:00
Kyle Edwards
553794e987 cmake::CreateProfilingEntry: Refactor to take lambda for args 2022-11-11 11:45:00 -05:00
Felipe Torrezan
f9ff6ab2d1 IAR: Fix ASM compiler architecture detection 
Narrow the regex to match the actual supported architectures,
avoiding mismatched detection.

Fixes: #24145
 2022-11-11 09:08:03 -05:00
Brad King
31893e8c8f Merge branch 'release-3.25' 2022-11-11 08:29:12 -05:00
Brad King
96b939584b Merge topic 'ci-msvc-14.34' 
bd5176abac gitlab-ci: Update Windows packaging builds to MSVC 14.34 toolset
ccdff280f4 gitlab-ci: Update Windows non-packaging builds to MSVC 14.34 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7891
 2022-11-11 08:29:11 -05:00
Brad King
d85f866baa Merge topic 'ci-msvc-14.34' into release-3.25 
bd5176abac gitlab-ci: Update Windows packaging builds to MSVC 14.34 toolset
ccdff280f4 gitlab-ci: Update Windows non-packaging builds to MSVC 14.34 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7891
 2022-11-11 08:29:10 -05:00
Brad King
b22715c144 Merge branch 'release-3.25' 2022-11-11 08:26:32 -05:00
Brad King
b0f02511e5 Merge topic 'ci-clang15-windows' 
46b2849550 ci: Update LLVM/Clang to 15.0 in nightly CI jobs on Windows
3eb94e4d51 ci: Simplify LLVM/Clang CI job specs on Windows
8ba5835c8d ci: Factor out helper to load clang into environment on Windows
bf2e4a2e85 ci: Factor out helper to load ninja into environment on Windows
93ff726114 Tests: Fix TryCompile bad source case for clang-cl 15 on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7897
 2022-11-11 08:26:32 -05:00
Brad King
13cfbd3639 Merge topic 'ci-clang15-windows' into release-3.25 
46b2849550 ci: Update LLVM/Clang to 15.0 in nightly CI jobs on Windows
3eb94e4d51 ci: Simplify LLVM/Clang CI job specs on Windows
8ba5835c8d ci: Factor out helper to load clang into environment on Windows
bf2e4a2e85 ci: Factor out helper to load ninja into environment on Windows
93ff726114 Tests: Fix TryCompile bad source case for clang-cl 15 on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7897
 2022-11-11 08:26:31 -05:00
Brad King
f2b438cb0a Merge branch 'release-3.25' 2022-11-11 08:19:51 -05:00
Brad King
7338a69881 Merge topic 'fix-cxx20-detection' 
5e7c8f44ac Ninja: Restore support for compilers not defining a C++ standard level

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Jaeden Amero <kitware@patater.com>
Acked-by: Martin Kojtal <martin.kojtal@arm.com>
Merge-request: !7896
 2022-11-11 08:19:51 -05:00
Brad King
f3f79be958 Merge topic 'fix-cxx20-detection' into release-3.25 
5e7c8f44ac Ninja: Restore support for compilers not defining a C++ standard level

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Jaeden Amero <kitware@patater.com>
Acked-by: Martin Kojtal <martin.kojtal@arm.com>
Merge-request: !7896
 2022-11-11 08:19:50 -05:00
Brad King
aab6022307 Merge branch 'release-3.25' 2022-11-11 08:16:47 -05:00
Brad King
1a85577547 Merge branch 'release-3.24' 2022-11-11 08:16:41 -05:00
Brad King
b31196f1d7 Merge branch 'release-3.24' into release-3.25 2022-11-11 08:16:31 -05:00
Brad King
6b4aebae38 Merge branch 'release-3.25' 2022-11-11 08:11:15 -05:00
Brad King
efefd80eda Merge topic 'expat-c-no-extensions' 
019af62294 expat: Activate POSIX APIs even without compiler extensions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7899
 2022-11-11 08:11:15 -05:00
Brad King
6b6b906412 Merge topic 'expat-c-no-extensions' into release-3.25 
019af62294 expat: Activate POSIX APIs even without compiler extensions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7899
 2022-11-11 08:11:14 -05:00
Kitware Robot
e462807942 CMake Nightly Date Stamp 2022-11-11 00:01:06 -05:00
Brad King
0325f04762 Merge branch 'expat-c-no-extensions' into release-3.24 
Merge-request: !7899
 2022-11-10 16:07:14 -05:00