Commit Graph

57526 Commits

Author SHA1 Message Date
Shao-Ce SUN
2c1ab065fe gitignore: Tell Git to ignore build*/ directories 2022-05-23 09:13:34 -04:00
Kitware Robot
c97fd9f065 CMake Nightly Date Stamp 2022-05-21 00:01:07 -04:00
Brad King
918e98e131 Merge topic 'vs-system-include'
7a2496daad VS: Add support for SYSTEM include directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7238
2022-05-20 09:12:57 -04:00
Brad King
88ed9355f5 Merge topic 'win_arm64_native_toolchain'
af6928ce92 VS: ARM64 as default toolset architecture for ARM64 host

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7264
2022-05-20 09:11:15 -04:00
Brad King
92c7c2c39a Merge topic 'findvulkan-improvements'
7974fcd1a7 FindVulkan: remove noop on CMAKE_MODULE_PATH in tests
acdb5fe0e8 FindVulkan: Add component for `glslc` and `glslangValidator`
998ee49779 FindVulkan: ensure policy CMP0057 is NEW to use `IN_LIST` with `if()`
9f8720e74c FindVulkan: Add component for `glslang`
8d133f49e3 FindVulkan: Add component for `SPIRV-Tools`
6e4d20921d FindVulkan: Add component for `shaderc_combined`
2f46b8d723 FindVulkan: Move `mark_as_advanced` right after `find_*` calls.
08a420af4a FindVulkan: Factorize code for library/executable search

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7225
2022-05-20 09:08:44 -04:00
Brad King
0631433745 Merge topic 'ci-win-package'
4c7c66dcf5 gitlab-ci: Add jobs to make Windows x86_64 and i386 packages
729ee30c2e gitlab-ci: Simplify collection of CTestTestfile artifacts
1eab922d92 Utilities/Release: Add script to sign and package Windows binaries
db48074d58 Utilities/Release: Add script to build Qt 5.12.1 Windows binaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !7281
2022-05-20 09:06:35 -04:00
Brad King
2bc13a6501 Merge branch 'release-3.23' 2022-05-20 09:05:16 -04:00
Brad King
4aa1f80596 Merge branch 'release-3.22' 2022-05-20 09:05:14 -04:00
Brad King
dba0358e24 Merge branch 'release-3.21' 2022-05-20 09:05:13 -04:00
Brad King
95ec7b4c1b Merge branch 'release-3.22' into release-3.23 2022-05-20 09:04:47 -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
a57652b0d6 Merge branch 'release-3.21' into release-3.22 2022-05-19 17:55:58 -04:00
Brad King
97ec556309 Merge branch 'vs2022-only' into release-3.22
Merge-request: !7282
2022-05-19 17:55:41 -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
4c7c66dcf5 gitlab-ci: Add jobs to make Windows x86_64 and i386 packages
Run CPack in a separate job for nightly binaries, and not at all for
release binaries.  Unlike macOS disk images (.dmg), we cannot sign the
binaries inside Windows installers (.msi) after-the-fact.  Instead,
produce enough artifacts from the build job to sign and package release
binaries manually.

Port build settings from `Utilities/Release/win/x86/Dockerfile` and its
helper scripts.
2022-05-19 15:25:55 -04:00
Brad King
729ee30c2e gitlab-ci: Simplify collection of CTestTestfile artifacts
gitlab-runner 13.0 and above support `**` to match arbitrary
directory paths.
2022-05-19 15:25:55 -04:00
Brad King
1eab922d92 Utilities/Release: Add script to sign and package Windows binaries
Windows binaries for official releases on `cmake.org` are signed
manually by a maintainer with a suitable signing certificate.
Add a script to sign the binaries, run CPack, and sign the installer.
2022-05-19 15:25:55 -04:00
Brad King
db48074d58 Utilities/Release: Add script to build Qt 5.12.1 Windows binaries
These may be used to build CMake binaries for Windows `x86_64` and `i386`.
Qt 5.12.1 supports Windows 7.

Port the logic from `Utilities/Release/win/x86/deps/Dockerfile` and its
helper scripts.
2022-05-19 15:25:54 -04:00
Niyas Sait
af6928ce92 VS: ARM64 as default toolset architecture for ARM64 host
Visual Studio 2022 17 Preview introduced a native ARM64 toolchain.
2022-05-19 09:57:54 -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
Josiah Bills
7a2496daad VS: Add support for SYSTEM include directories
Fixes: #17904
2022-05-18 18:52:00 -04:00
MACHIZAUD Andréa
7974fcd1a7 FindVulkan: remove noop on CMAKE_MODULE_PATH in tests 2022-05-18 23:16:11 +02:00
MACHIZAUD Andréa
acdb5fe0e8 FindVulkan: Add component for glslc and glslangValidator
For backward compatibility with previous CMake versions they are implicitly added to the list of components
2022-05-18 23:16:11 +02:00
MACHIZAUD Andréa
998ee49779 FindVulkan: ensure policy CMP0057 is NEW to use IN_LIST with if() 2022-05-18 23:16:11 +02:00
MACHIZAUD Andréa
9f8720e74c FindVulkan: Add component for glslang 2022-05-18 23:16:09 +02:00
MACHIZAUD Andréa
8d133f49e3 FindVulkan: Add component for SPIRV-Tools 2022-05-18 23:15:50 +02:00
MACHIZAUD Andréa
6e4d20921d FindVulkan: Add component for shaderc_combined 2022-05-18 23:15:48 +02: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