mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 22:58:37 -05:00
Code Issues Packages Projects Releases Wiki Activity
61,783 Commits 2 Branches 401 Tags
73ce0b792f487abff8fc8bdc100d8ac873311868
Commit Graph

61783 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Neundorf 73ce0b792f Help: minor improvement for the CMAKE_PREFIX_PATH docs 
With this patch the CMAKE_PREFIX_PATH env. var. is now mentioned
in the help for the CMAKE_PREFIX_PATH cmake var.
 2023-04-29 20:20:09 +02:00
Kitware Robot 73ebfe6613 CMake Nightly Date Stamp 2023-04-29 00:01:09 -04:00
Brad King f9da4cf8f1 Merge topic 'FindDoxygen-custom-config-file' 
5ee19d5746 FindDoxygen: Optionally use custom config file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8439
 2023-04-28 10:14:24 -04:00
Brad King 5aab50d4b7 Merge topic 'ignore_unity_suspicious_include' 
485256f2d0 Unity: Suppress clang-tidy 'bugprone-suspicious-include' warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8437
 2023-04-28 10:13:18 -04:00
Brad King 602481ee67 Merge topic 'add-missing-keyword-to-vim' 
f4d2772049 vim: Add missing RELATIVE keyword for FILE command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8440
 2023-04-28 10:12:00 -04:00
Brad King ebf3f48dab Merge topic 'modules-if-deref' 
21e13f2416 CMakeDetermineCXXCompiler: Avoid if() quoted auto-dereference

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8438
 2023-04-28 10:10:39 -04:00
Brad King 3df699544b Merge topic 'update_FindCUDAToolkit_nvrtc_notes' 
0e0eb12918 FindCUDAToolkit: Update nvrtc section to clarify a static version exists

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8436
 2023-04-28 10:09:40 -04:00
Brad King 9b463cc4b5 Merge topic 'iar-silent-flag' 
01e944128d IAR: Move linker silencing flag to CMAKE_EXE_LINKER_FLAGS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8421
 2023-04-28 10:08:22 -04:00
Kitware Robot fce9c81fc6 CMake Nightly Date Stamp 2023-04-28 00:01:10 -04:00
Le Go 5ee19d5746 FindDoxygen: Optionally use custom config file 2023-04-27 16:54:00 -04:00
Joris Clement f4d2772049 vim: Add missing RELATIVE keyword for FILE command 2023-04-27 15:40:26 -04:00
Sylvain Joubert 485256f2d0 Unity: Suppress clang-tidy 'bugprone-suspicious-include' warning 
Unity builds intentionally include entire source files.

Fixes: #24857
 2023-04-27 12:41:30 -04:00
Brad King 21e13f2416 CMakeDetermineCXXCompiler: Avoid if() quoted auto-dereference 
This was missed by commit 29c3edb87a (Avoid if() quoted
auto-dereference, 2014-10-14, v3.2.0-rc1~501^2).

Fixes: #24859
 2023-04-27 12:13:22 -04:00
Brad King 582c17bdd2 Merge topic 'ninja-nvhpc-fortran-Werror' 
0f6a1dd3ed Ninja: Revert "Exclude NVHPC -Werror flags during Fortran preprocessing"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8435
 2023-04-27 09:40:21 -04:00
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
Robert Maynard 0e0eb12918 FindCUDAToolkit: Update nvrtc section to clarify a static version exists 
Fixes #24798
 2023-04-27 08:53:32 -04:00
Kitware Robot 7d62611a97 CMake Nightly Date Stamp 2023-04-27 00:01:08 -04:00
Brad King 0f6a1dd3ed Ninja: Revert "Exclude NVHPC -Werror flags during Fortran preprocessing" 
Revert commit 6b58cdd4cf (Ninja: Exclude NVHPC -Werror flags during
Fortran preprocessing, 2023-04-04).  Since commit 9d40f01442 (NVHPC: Use
-Werror for COMPILE_OPTIONS_WARNING_AS_ERROR, 2023-04-13), `nvfortran`
can handle the plain `-Werror` flag during preprocessing.

Issue: #24665
 2023-04-26 14:36:46 -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
Felipe Torrezan 01e944128d IAR: Move linker silencing flag to CMAKE_EXE_LINKER_FLAGS 
The IAR linker silencer flag was previously hardcoded in
`CMAKE_${lang}_LINKER_EXECUTABLE`.  Move the flag to a place that is
under the end user's control.  The default behavior (silenced linker) is
not changed.

Fixes: #24828
 2023-04-26 10:48:31 -04: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