mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-01 20:00:51 -05:00
Code Issues Packages Projects Releases Wiki Activity
57,501 Commits 2 Branches 401 Tags
dba0358e243cf4fa824396d72d9cd531b0962152
Commit Graph

57501 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King dba0358e24 Merge branch 'release-3.21' 2022-05-20 09:05:13 -04:00
Brad King 695c61ccce Merge branch 'release-3.23' 2022-05-20 09:04:00 -04:00
Brad King 4b140fa621 Merge topic 'vs2022-only' 
235b5fb05b file(GET_RUNTIME_DEPENDENCIES): Support VS 2022 without VS 2019

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7282
 2022-05-20 09:04:00 -04:00
Brad King f748ea2186 Merge topic 'vs2022-only' into release-3.23 
235b5fb05b file(GET_RUNTIME_DEPENDENCIES): Support VS 2022 without VS 2019

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7282
 2022-05-20 09:03:59 -04:00
Kitware Robot f43c0e0f7b CMake Nightly Date Stamp 2022-05-20 00:01:08 -04:00
Brad King f334235c19 Merge branch 'vs2022-only' into release-3.21 
Merge-request: !7282
 2022-05-19 17:55:04 -04:00
Brad King 235b5fb05b file(GET_RUNTIME_DEPENDENCIES): Support VS 2022 without VS 2019 
Find MSVC tools in VS 2022 installation.
 2022-05-19 17:50:06 -04:00
Brad King 9daa244e99 Merge topic 'find_item-doc-update' 
98af010b5c Help: Avoid duplicating registry query syntax in multiple find_* commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7278
 2022-05-19 09:51:26 -04:00
Brad King 758756d1ba Merge topic 'ignore-werror-command-arg' 
65f7053d6c COMPILE_WARNING_AS_ERROR: Add command-line option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7268
 2022-05-19 09:43:53 -04:00
Brad King f808b19020 Merge topic 'verify-interface-header-sets' 
259c265112 VERIFY_HEADER_SETS: Rename to VERIFY_INTERFACE_HEADER_SETS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7279
 2022-05-19 09:41:52 -04:00
Brad King 3c1c369b36 Merge branch 'release-3.23' 2022-05-19 09:40:00 -04:00
Brad King 48a303e6f4 Merge topic 'cpack-nuget-components-on-windows' 
066ff258db CPack/NuGet: Restore component packaging on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7280
 2022-05-19 09:39:59 -04:00
Brad King 2ca51e6f74 Merge topic 'cpack-nuget-components-on-windows' into release-3.23 
066ff258db CPack/NuGet: Restore component packaging on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7280
 2022-05-19 09:39:58 -04:00
Kitware Robot 80c2b994d6 CMake Nightly Date Stamp 2022-05-19 00:01:09 -04:00
Marc Chevrier 98af010b5c Help: Avoid duplicating registry query syntax in multiple find_* commands 
In commit 8d7e80cf3d (find_* commands: add control over Windows registry
views, 2022-04-16) we added documentation that is repeated by multiple
find commands.  Move it to a dedicated manual section to avoid duplication.
 2022-05-18 12:43:58 -04:00
Alex Turbov 066ff258db CPack/NuGet: Restore component packaging on Windows 
The change from `\` to `/` in commit dade75509f (CPack/NuGet: Fix nuspec
file generation for UNIX-style OS, 2020-12-21, v3.20.0-rc1~243^2) does
not work on Windows.  Use `cmake_path` to form a path to an image
directory with preinstalled files.

Fixes: #22489
 2022-05-18 11:12:02 -04:00
Martin Duffy 65f7053d6c COMPILE_WARNING_AS_ERROR: Add command-line option 
Add command-line option `--compile-no-warning-as-error` to ignore value of
`COMPILE_WARNING_AS_ERROR`.

Issue: #19085
 2022-05-18 10:30:30 -04:00
Kyle Edwards 259c265112 VERIFY_HEADER_SETS: Rename to VERIFY_INTERFACE_HEADER_SETS 
Issue: #23448
 2022-05-18 10:18:40 -04:00
Brad King 58446c84e4 Merge branch 'release-3.23' 2022-05-18 08:43:32 -04:00
Brad King 114acce9a1 Merge topic 'ccmake-fix-infinite-loop-search' 
432a8ab739 ccmake: Fix infinite loop during invalid search

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7269
 2022-05-18 08:43:31 -04:00
Brad King 640268c19b Merge topic 'ccmake-fix-infinite-loop-search' into release-3.23 
432a8ab739 ccmake: Fix infinite loop during invalid search

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7269
 2022-05-18 08:43:30 -04:00
Martin Duffy 432a8ab739 ccmake: Fix infinite loop during invalid search 
Fix issue introduced in commit 2defe9ff95 (ccmake: Fix crash when
deleting all cache entries, 2022-05-12).

Leaving the Empty Cache widget always on the Entry list had unforeseen
consequences, including that it caused an infinite loop when searching
for a string that did not match any variables.
 2022-05-18 08:04:10 -04:00
Brad King aa2de7cd2a Merge branch 'release-3.23' 2022-05-18 08:02:10 -04:00
Brad King 59b3e97720 Merge topic 'clang-imsvc' 
faed1562fb Merge branch 'backport-3.23-clang-imsvc' into clang-imsvc
23a52561c7 Clang: Use -imsvc flag without space to support Clang tools

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Acked-by: hihig2001 <hihig@bluehole.net>
Merge-request: !7274
 2022-05-18 08:02:10 -04:00
Brad King 44ccfdbe0b Merge topic 'clang-imsvc' into release-3.23 
23a52561c7 Clang: Use -imsvc flag without space to support Clang tools

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Acked-by: hihig2001 <hihig@bluehole.net>
Merge-request: !7274
 2022-05-18 08:02:09 -04:00
Brad King 6daf38dec6 Merge topic 'FindGLUT-remove-undocumented-vars' 
6c053e68df FindGLUT: Remove undocumented variables GLUT_INCLUDE_PATH and GLUT_LIBRARY

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7273
 2022-05-18 08:00:48 -04:00
Brad King 334f7ac87f Merge topic 'fetchcontent-subbuild-config-type-fix' 
82f3ceb26b FetchContent: Use Debug rather than Release for sub-build

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7272
 2022-05-18 07:58:50 -04:00
Kitware Robot 9f469d533d CMake Nightly Date Stamp 2022-05-18 00:01:10 -04:00
Brad King faed1562fb Merge branch 'backport-3.23-clang-imsvc' into clang-imsvc 2022-05-17 11:20:15 -04:00
Brad King 23a52561c7 Clang: Use -imsvc flag without space to support Clang tools 
Since commit bb61c2d024 (Clang: use -imsvc for system include dirs when
running on Windows, 2020-09-16, v3.19.0-rc1~162^2) we use the `-imsvc`
flag followed by the include directory as a separate argument.  Some
versions of `clang-tidy` do not support the flag unless the include
directory is attached to it, so use that form instead.

A similar fix was made by commit 3a8b6653dc (MSVC: Use -external:I flag
without space to support Clang tools, 2022-01-11, v3.22.2~8^2).

Fixes: #23517
 2022-05-17 11:09:15 -04:00
Letu Ren 6c053e68df FindGLUT: Remove undocumented variables GLUT_INCLUDE_PATH and GLUT_LIBRARY 
Fixes: #23370
 2022-05-17 09:08:12 -04:00
Brad King a7cd15a61c Merge topic 'try_compile-project-platform-vars' 
a6562ff579 try_compile: Add option to skip passing platform variables
4843a37676 try_compile: Propagate platform variables in project-mode too

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7265
 2022-05-17 08:57:55 -04:00
Brad King 20ed6f697e Merge topic 'update-curl' 
71747a28ea Merge branch 'upstream-curl' into update-curl
9d8f81f4f8 curl 2022-05-11 (462196e6)
02902188ec curl: Update script to get curl 7.83.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7267
 2022-05-17 08:52:48 -04:00
Brad King e561e29e04 Merge topic 'findzlib-static' 
3f0b9663a4 FindZLIB: fix ZLIB_USE_STATIC_LIBS on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7262
 2022-05-17 08:52:09 -04:00
Brad King 2adfa82e28 Merge topic 'install-all-components-fix' 
b0c8e31b54 install: Don't ignore EXCLUDE_FROM_ALL when used with ALL_COMPONENTS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7263
 2022-05-17 08:50:33 -04:00
Brad King 37cdf215ac Merge branch 'release-3.23' 2022-05-17 08:48:55 -04:00
Brad King f2eb9d645f Merge branch 'release-3.22' 2022-05-17 08:48:53 -04:00
Brad King 5b3096198a Merge branch 'release-3.22' into release-3.23 2022-05-17 08:48:45 -04:00
Brad King 42dd6eabd4 Merge branch 'release-3.23' 2022-05-17 08:47:32 -04:00
Brad King 2ef9865f09 Merge topic 'FortranCInterface-gcc12' 
cb616d43d6 FortranCInterface: Fix failure with gfortran 12 and Clang

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7266
 2022-05-17 08:47:31 -04:00
Brad King e05a476700 Merge topic 'FortranCInterface-gcc12' into release-3.23 
cb616d43d6 FortranCInterface: Fix failure with gfortran 12 and Clang

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7266
 2022-05-17 08:47:30 -04:00
Brad King 334c3cd435 Merge topic 'ci-intel-compiler' 
cb3feb1efe gitlab-ci: add jobs testing Intel 2022.1.0 compilers on Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7270
 2022-05-17 08:46:20 -04:00
Craig Scott 82f3ceb26b FetchContent: Use Debug rather than Release for sub-build 
The config used can be part of the path to the sub-build. On some
platforms, there are restrictions on the length of paths or file names.
Use Debug rather than Release because the former is shorter.
When CMAKE_CONFIGURATION_TYPES is left at its default, this also
makes the path the same as the previous default before 10865c8e5f
(FetchContent: Hard-code a config for the sub-build, 2022-05-01) .
 2022-05-17 14:42:31 +10:00
Kitware Robot 943210856a CMake Nightly Date Stamp 2022-05-17 00:01:08 -04:00
Brad King cb3feb1efe gitlab-ci: add jobs testing Intel 2022.1.0 compilers on Linux 
Note that the classic compiler version is 2021.6.0, but we still
have it in the 2022.1.0 base image.
 2022-05-16 17:29:16 -04:00
Brad King 71747a28ea Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2022-05-11 (462196e6)
 2022-05-16 11:43:51 -04:00
Curl Upstream 9d8f81f4f8 curl 2022-05-11 (462196e6) 
Code extracted from:

    https://github.com/curl/curl.git

at commit 462196e6b4a47f924293a0e26b8e9c23d37ac26f (curl-7_83_1).
 2022-05-16 11:43:24 -04:00
Brad King 02902188ec curl: Update script to get curl 7.83.1 2022-05-16 11:43:15 -04:00
Brad King 4a9e2a1572 Merge branch 'FortranCInterface-gcc12' into release-3.22 
Merge-request: !7266
 2022-05-16 11:19:29 -04:00
Brad King cb616d43d6 FortranCInterface: Fix failure with gfortran 12 and Clang 
The C flags added by commit 6a0ce19ce1 (FortranCInterface: Fix
compatibility with GCC gfortran 12 LTO, 2022-01-19, v3.22.2~5^2)
should only be added for the GNU C compiler.

Fixes: #23500
Issue: #23123
 2022-05-16 11:18:00 -04:00