Commit Graph

61766 Commits

Author SHA1 Message Date
Craig Scott
0ca98beb57 Merge topic 'ExternalProject-relative-git-urls'
550f63447d ExternalProject/FetchContent: Support relative remote URLs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7988
2023-04-27 09:12:26 -04:00
Brad King
2fbcc81440 Merge topic 'vs-show-cmake-files'
df58dbb0e9 VS: Add CMake input files to ZERO_CHECK
659e9ae937 cmGlobalVisualStudio8Generator: Collect CMake input files earlier

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8260
2023-04-27 09:10:56 -04:00
Brad King
c6bcb53a50 Merge topic 'orkun_21455_26_04_2023'
315b13432c Autogen: Update test comments about Qt versions
64b44b362b Autogen: Add AUTORCC test /w AUTOGEN_BUILD_DIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8434
2023-04-27 09:09:21 -04:00
Brad King
c56c8a930b Merge topic 'vs-android-auto-arch'
ca6e81a31f VS/Android: Deduce processor type from CMAKE_GENERATOR_PLATFORM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8425
2023-04-27 09:08:13 -04:00
Brad King
5f40448da5 Merge topic 'fix-short-path'
a368a59467 Windows: Tolerate GetShortPathNameW failure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8432
2023-04-27 09:07:18 -04:00
Brad King
c8c6e9ac1b Merge topic 'ci-intel-compiler'
710d6515ac gitlab-ci: add jobs testing Intel 2023.1.0 compilers on Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8433
2023-04-27 09:06:20 -04:00
Brad King
d5095028ea Merge topic 'preset-includes-macro-expansion'
f552ba6e6d presets: add support for macro expansion to includes
1df24df01f presets: Fix encoding of env/penv macro expansion on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8255
2023-04-27 09:05:13 -04:00
Kitware Robot
7d62611a97 CMake Nightly Date Stamp 2023-04-27 00:01:08 -04:00
Orkun Tokdemir
315b13432c Autogen: Update test comments about Qt versions 2023-04-26 18:12:12 +02:00
Michael Karcher
ca6e81a31f VS/Android: Deduce processor type from CMAKE_GENERATOR_PLATFORM
Closes: #24839
2023-04-26 18:11:23 +02:00
Orkun Tokdemir
64b44b362b Autogen: Add AUTORCC test /w AUTOGEN_BUILD_DIR 2023-04-26 18:07:04 +02:00
Oldřich Jedlička
a368a59467 Windows: Tolerate GetShortPathNameW failure
This function is used by NMake Makefile generator, but when shortening path
fails, it previously returned an empty string.  `ERROR_ACCESS_DENIED` is
returned for paths within `C:\Program Files\WindowsApps`, which is
a special folder with limited access rights.  It looks like this is
[by design](https://superuser.com/a/1730061/213587).

Fixes: #24853
2023-04-26 10:40:05 -04:00
Brad King
710d6515ac gitlab-ci: add jobs testing Intel 2023.1.0 compilers on Linux
Note that the classic compiler version is 2021.9.0, but we still
have it in the 2023.1.0 base image.
2023-04-26 10:34:19 -04:00
Brad King
663cc941bd Merge topic 'iwyu_errors'
fcacc319d9 IWYU: Return error code if user enables error reporting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8406
2023-04-26 10:31:11 -04:00
Brad King
d5d06ec444 Merge topic 'vs2022-android'
16d8b65bc0 VS/Android: Use safe API level when detecting the NDK directory
f7af10100c VS/Android: Detect full NDK root instead of sysroot
850ee280e0 VS/Android: Set API level explicitly during compiler identification
5d5b6c741d VS/Android: Do not specify Windows Runtime library type during compiler id
e78abf94e3 VS/Android: Use ApplicationTypeRevision 3.0 in VS2022

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8426
2023-04-26 10:28:38 -04:00
Brad King
af53934df7 Merge topic 'update-libarchive'
ba5ced1be6 libarchive: Set build options the way we need for CMake
1e2bce305f Merge branch 'upstream-LibArchive' into update-libarchive
e468170731 LibArchive 2022-12-09 (ba80276c)
744a42c0ee libarchive: Update script to get 3.6.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8431
2023-04-26 10:27:03 -04:00
Brad King
1ac569fdaa Merge topic 'fortran_ninja_compile_as_warning'
9d40f01442 NVHPC: Use -Werror for COMPILE_OPTIONS_WARNING_AS_ERROR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8415
2023-04-26 10:24:28 -04:00
Brad King
3f3c3d3e71 Merge branch 'release-3.26' 2023-04-26 10:22:27 -04:00
Brad King
b92e21cab8 Merge topic 'FindCUDAToolkit-static-deps'
1d6c343661 FindCUDAToolkit: Add missing static library dependencies on pthread and libdl

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8422
2023-04-26 10:22:27 -04:00
Brad King
b548c7efa6 Merge topic 'FindCUDAToolkit-static-deps' into release-3.26
1d6c343661 FindCUDAToolkit: Add missing static library dependencies on pthread and libdl

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8422
2023-04-26 10:22:26 -04:00
Brad King
1ca371a7f0 Merge branch 'release-3.26' 2023-04-26 10:21:13 -04:00
Brad King
768c36e256 Merge topic 'FindCUDAToolkit_nvrtc_windows_dependencies'
11a9f88bdf FindCUDAToolkit: Fix nvrtc_static dependencies on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8405
2023-04-26 10:21:13 -04:00
Brad King
f0b45e6dbb Merge topic 'FindCUDAToolkit_nvrtc_windows_dependencies' into release-3.26
11a9f88bdf FindCUDAToolkit: Fix nvrtc_static dependencies on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8405
2023-04-26 10:21:12 -04:00
Robert Maynard
1d6c343661 FindCUDAToolkit: Add missing static library dependencies on pthread and libdl
Discourse-topic: https://discourse.cmake.org/t/7946
2023-04-26 10:19:59 -04:00
Zoran Angelov
f552ba6e6d presets: add support for macro expansion to includes
Only `$penv{}` can be expanded when processing includes.
2023-04-26 10:03:53 -04:00
Brad King
1df24df01f presets: Fix encoding of env/penv macro expansion on Windows
Look up environment variables using a wide-character API on Windows,
and convert their value to our internal UTF-8 encoding.
2023-04-26 10:03:14 -04:00
Marc Chevrier
d77b3d342e Merge topic 'test-driver-use-anonymous-namespace'
ca2a84c3d7 TestDriver: Fix 'misc-use-anonymous-namespace' warning from clang-tidy 16

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8413
2023-04-26 04:48:00 -04:00
Chris Wright
550f63447d ExternalProject/FetchContent: Support relative remote URLs
Teach `ExternalProject_Add` and `FetchContent_Declare` to resolve
relative remote URLs provided via `GIT_REPOSITORY`.  Add policy
CMP0150 to maintain compatibility.

Fixes: #24211
Co-Authored-By: Craig Scott <craig.scott@crascit.com>
2023-04-26 16:30:36 +08:00
Kitware Robot
941113b063 CMake Nightly Date Stamp 2023-04-26 00:01:14 -04:00
Alexander Neundorf
df58dbb0e9 VS: Add CMake input files to ZERO_CHECK
Add all cmake input files to the `ZERO_CHECK` project.  Place files
under `CMAKE_SOURCE_DIR` in a folder structure matching the directory
structure.  This way they are easier to find, and Visual Studio does not
close them when reloading the project.

Fixes: #24557
2023-04-25 17:35:39 -04:00
Alexander Neundorf
659e9ae937 cmGlobalVisualStudio8Generator: Collect CMake input files earlier 2023-04-25 16:48:41 -04:00
Michael Karcher
16d8b65bc0 VS/Android: Use safe API level when detecting the NDK directory 2023-04-25 13:49:03 -04:00
Michael Karcher
f7af10100c VS/Android: Detect full NDK root instead of sysroot
Visual Studio always uses a complete NDK and not a standalone toolchain.
Let CMake handle the NDK and related logic correctly, avoid trying to
find the standalone toolchain version from the unified clang toolchain
in newer NDKs.
2023-04-25 13:48:33 -04:00
Michael Karcher
850ee280e0 VS/Android: Set API level explicitly during compiler identification
VS2022 defaults to API 31 in 64-bit builds.  This breaks if you combine
VS2022 with an older Android NDK.
2023-04-25 13:47:17 -04:00
Michael Karcher
5d5b6c741d VS/Android: Do not specify Windows Runtime library type during compiler id
The VS2022 Clang toolchain adds some windows libraries to the linked
library list if RuntimeLibrary is set, even if the Project is targeting
Android.  This causes an unexpected linker failure.
2023-04-25 13:46:10 -04:00
Michael Karcher
e78abf94e3 VS/Android: Use ApplicationTypeRevision 3.0 in VS2022
Visual Studio 17 (Marketing name: Visual Studio 2022) still ships with
"3.0" as most recent Variant of the Android application type.
Use this revision.
2023-04-25 13:45:37 -04:00
Robert Maynard
11a9f88bdf FindCUDAToolkit: Fix nvrtc_static dependencies on Windows
Required for CUDA toolkit 11.5:

* https://docs.nvidia.com/cuda/archive/11.5.0/nvrtc/index.html#build-instruction
2023-04-25 13:37:19 -04:00
Ashish Sadanandan
fcacc319d9 IWYU: Return error code if user enables error reporting
Previously CMake ignored the return code from iwyu because old versions
of the tool would exit with an error code even when no header include
violations were detected.  The iwyu project has since changed this
behavior, so the tool no longer returns an error code unless the user
enables error reporting via command line arguments.

Behavior seen with iwyu version 0.19

Source file with missing includes:
 - Case 1: iwyu arguments:
   - return code: 0
   - output: <report of all missing includes>
 - Case 2: iwyu arguments: `-Xiwyu --error`
   - return code: 1
   - output: <report of all missing includes>

Source file with no missing includes:
 - Case 1: iwyu arguments:
   - return code: 0
   - output: `(/path/to/file.cc has correct #includes/fwd-decls)`
 - Case 2: iwyu arguments: `-Xiwyu --error`
   - return code: 0
   - output: `(/path/to/file.cc has correct #includes/fwd-decls)`

Teach CMake to return the iwyu return code if the user has invoked the
tool with any of these command line arguments included:
 - `--error[=N]`
 - `--error_always[=N]`

Fixes: #24066
2023-04-25 11:18:36 -04:00
Robert Maynard
9d40f01442 NVHPC: Use -Werror for COMPILE_OPTIONS_WARNING_AS_ERROR
The previously-used `-Werror all-warnings` is not supported by
the NVHPC suite of compilers.  This previously worked since `-Werror`
was being used and `all-warnings` was being excluded.

We thought this was the correct syntax due to incorrect documentation
about `-Werror`, which stated the argument should be space-separated,
while it should actually be separated with `=` or `,`.

Issue: #24665
2023-04-25 11:16:26 -04:00
Brad King
ba5ced1be6 libarchive: Set build options the way we need for CMake 2023-04-25 10:35:27 -04:00
Brad King
1e2bce305f Merge branch 'upstream-LibArchive' into update-libarchive
* upstream-LibArchive:
  LibArchive 2022-12-09 (ba80276c)
2023-04-25 10:28:08 -04:00
LibArchive Upstream
e468170731 LibArchive 2022-12-09 (ba80276c)
Code extracted from:

    https://github.com/libarchive/libarchive.git

at commit ba80276ccc3c941c4918ec6e2460059f0c525c43 (v3.6.2).
2023-04-25 10:25:30 -04:00
Brad King
744a42c0ee libarchive: Update script to get 3.6.2 2023-04-25 10:20:59 -04:00
Brad King
827d5b75d4 Merge topic 'CMake-uses-cmList-class'
e08ba229ee CMake code rely on cmList class for CMake lists management (part. 1)
51b0d45d91 cmExpandList and cmExpandLists rely on cmList class

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8423
2023-04-25 09:52:40 -04:00
Sylvain Joubert
ca2a84c3d7 TestDriver: Fix 'misc-use-anonymous-namespace' warning from clang-tidy 16
C++ best practices recommend using anonymous namespace instead of a global
static qualifier.
2023-04-25 12:54:31 +02:00
Kitware Robot
26087d558f CMake Nightly Date Stamp 2023-04-25 00:01:06 -04:00
Marc Chevrier
e08ba229ee CMake code rely on cmList class for CMake lists management (part. 1) 2023-04-24 10:41:10 +02:00
Kitware Robot
3c952e97e2 CMake Nightly Date Stamp 2023-04-24 00:01:26 -04:00
Marc Chevrier
51b0d45d91 cmExpandList and cmExpandLists rely on cmList class 2023-04-23 14:48:36 +02:00
Kitware Robot
ec4331d7b5 CMake Nightly Date Stamp 2023-04-23 00:01:08 -04:00