Commit Graph

61716 Commits

Author SHA1 Message Date
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
Kitware Robot
3cf8206412 CMake Nightly Date Stamp 2023-04-21 00:01:07 -04:00
Marc Chevrier
c36f03bfec Merge topic 'GenEx-list'
31675964e7 GenEx LIST: list operations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8410
2023-04-20 11:02:14 -04:00
Kitware Robot
4862d3e90d CMake Nightly Date Stamp 2023-04-20 00:01:06 -04:00
Kitware Robot
bd94194334 CMake Nightly Date Stamp 2023-04-19 00:01:11 -04:00
Kitware Robot
79499f9e71 CMake Nightly Date Stamp 2023-04-18 00:01:06 -04:00
Craig Scott
c648d7363d Merge topic 'doc-workflow-presets-vendor'
dd8ac2f5ca Help: Add missing vendor field to the workflow presets docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8419
2023-04-17 05:58:58 -04:00
Craig Scott
b79c444e53 Merge topic 'export-file-set-old-cmake-versions'
42e5be8cef install(EXPORT): Fall back to set_property(APPEND) for FILE_SET

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8408
2023-04-17 05:58:05 -04:00
Marc Chevrier
ae1e8e288e Merge branch 'release-3.26' 2023-04-17 05:15:59 -04:00
Marc Chevrier
62967ea178 Merge topic 'Help-CMP0105-clarifications'
c96df3dc8b Merge branch 'backport-3.26-help-CMP0105' into Help-CMP0105-clarifications
afd40232fa Help: CMP0105 policy: clarifications

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8418
2023-04-17 05:15:59 -04:00
Marc Chevrier
32c3dbbee8 Merge topic 'Help-CMP0105-clarifications' into release-3.26
afd40232fa Help: CMP0105 policy: clarifications

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8418
2023-04-17 05:15:58 -04:00
Kitware Robot
911b285640 CMake Nightly Date Stamp 2023-04-17 00:01:25 -04:00
Marc Chevrier
31675964e7 GenEx LIST: list operations
Fixes: #24550, #24547
2023-04-16 12:00:20 +02:00
Kitware Robot
fee5bd296b CMake Nightly Date Stamp 2023-04-16 00:01:06 -04:00
Marc Chevrier
c96df3dc8b Merge branch 'backport-3.26-help-CMP0105' into Help-CMP0105-clarifications 2023-04-15 10:24:10 +02:00
Marc Chevrier
afd40232fa Help: CMP0105 policy: clarifications 2023-04-15 10:11:22 +02:00
Kitware Robot
ef51f3007f CMake Nightly Date Stamp 2023-04-15 00:01:08 -04:00
Craig Scott
dd8ac2f5ca Help: Add missing vendor field to the workflow presets docs
The JSON schema already allows a vendor field for workflow presets,
but it was missed in the documentation. There is no change in behavior
or support, this just fixes an oversight in the docs when the workflow
presets were originally added.
2023-04-15 11:13:11 +10:00
Kitware Robot
0991023c30 CMake Nightly Date Stamp 2023-04-14 00:01:08 -04:00
Kitware Robot
cf6a580e89 CMake Nightly Date Stamp 2023-04-13 00:01:07 -04:00
Kyle Edwards
42e5be8cef install(EXPORT): Fall back to set_property(APPEND) for FILE_SET
FILE_SET was introduced in CMake 3.23, so install(EXPORT) puts it
behind a version gate. However, this results in the include directories
not being picked up by older versions of CMake. Fall back to
set_property(APPEND) for versions of CMake older than 3.23.

Fixes: #24787
2023-04-12 09:33:24 -04:00
Kitware Robot
e256e35daa CMake Nightly Date Stamp 2023-04-12 00:01:08 -04:00
Kitware Robot
6c11f7e4a8 CMake Nightly Date Stamp 2023-04-11 00:01:07 -04:00
Craig Scott
e245b4df75 Merge topic 'automoc-macro-names'
c5c3aff1f5 Autogen: Add INTERFACE_AUTOMOC_MACRO_NAMES target property
69cf9700e6 Autogen: Defer setup until Generate step
7cecb6353e cmGeneratorTarget: Factor out EvaluatedTargetProperty infrastructure
2daba01ddf cmGeneratorTarget: Avoid incidental include-what-you-use warning
850b4d990c IWYU: Add mapping for 'std::remove_reference<Defer &>::type'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8391
2023-04-10 18:06:06 -04:00
Craig Scott
453cf8a196 Merge topic 'ninja-nvhpc-fortran-Werror'
6b58cdd4cf Ninja: Exclude NVHPC -Werror flags during Fortran preprocessing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8393
2023-04-10 17:34:47 -04:00
Kitware Robot
83525bfd7a CMake Nightly Date Stamp 2023-04-10 00:01:51 -04:00
Craig Scott
79cf78dcf4 Merge topic 'python-file-encoding'
b855674f5d Tests: Always load presets schema as UTF-8
0de00b8b69 Sphinx: Modernize UTF-8 encoding handling when updating CMake.qhp
f0d6010cb5 Sphinx: Specify encoding when opening files for title extraction

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8402
2023-04-09 06:59:13 -04:00
Orkun Tokdemir
c5c3aff1f5 Autogen: Add INTERFACE_AUTOMOC_MACRO_NAMES target property
Add this target property to specify macro names that propagate to
dependents as `AUTOMOC_MACRO_NAMES`.  The dependents will automatically
generate MOC files for source files that contain the inherited macro
names.

Co-Authored-By: Craig Scott <craig.scott@crascit.com>
Fixes: #19679
2023-04-09 20:51:15 +10:00
Marc Chevrier
ffd0759c7a Merge topic 'list-command-uses-cmList'
e8c581606d list(): rely on cmList class

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8401
2023-04-09 05:42:59 -04:00
Kitware Robot
c271ee5ba9 CMake Nightly Date Stamp 2023-04-09 00:01:06 -04:00
Marc Chevrier
e8c581606d list(): rely on cmList class
Fixes: #24549
2023-04-08 12:55:42 +02:00
Kitware Robot
9080ea4e6c CMake Nightly Date Stamp 2023-04-08 00:01:06 -04:00
Craig Scott
b855674f5d Tests: Always load presets schema as UTF-8
We know the encoding of the schema file, so we should specify it
when we open it for reading. Previously, by not specifying it, the test
was open to using an encoding based on the active locale when
running the test. We may have been enforcing a "C" locale at a higher
level, but we don't need to rely on that here, we can force correct
behavior without that assumption.

Issue: #24679
2023-04-07 18:22:13 +10:00
Craig Scott
0de00b8b69 Sphinx: Modernize UTF-8 encoding handling when updating CMake.qhp 2023-04-07 18:14:18 +10:00
Craig Scott
f0d6010cb5 Sphinx: Specify encoding when opening files for title extraction
When the encoding is not specified, open() may choose an encoding
based on the locale in use. That encoding may have no relationship
to the encoding of the file being opened. Use the locale from the
document settings instead, which should better match the file's
encoding.

Fixes: #24679
2023-04-07 18:11:05 +10:00
Kitware Robot
9af53e9bcf CMake Nightly Date Stamp 2023-04-07 00:01:10 -04:00
Brad King
0dcb545602 Merge topic 'cmList-class'
72d116ee68 GenEx: list oriented genexes use cmList class
9f60f19ee9 cmList: CMake list implementation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8375
2023-04-06 09:16:31 -04:00
Brad King
fbdb509efe Merge topic 'vs-sdk-selection'
8ecb645934 VS: Select Windows SDK matching WindowsSDKVersion env var
f90c8ab54e VS: Select latest available Windows SDK version by default
b512c53d43 VS: Add support for setting WindowsTargetPlatformVersion to 10.0
2f3d945f83 VS: Add CMAKE_GENERATOR_PLATFORM field to control Windows SDK selection
f0a67b6291 VS: Parse comma-separated fields from CMAKE_GENERATOR_PLATFORM
e259063b0a VS: Defer Windows SDK selection until CMAKE_GENERATOR_PLATFORM is known
8499374c6a VS: Simplify logic to require SDK for Windows Store
1c8d4b4bf1 Tests: Teach RunCMake_TEST_FILTER to account for test variant description

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8389
2023-04-06 09:13:31 -04:00
Brad King
703f87f32f Merge topic 'ci-windows'
b7400800df ci: Make python available in all Windows test jobs
99bf8418ee ci: Update to Python 3.11.3 in Windows jobs
967456423b ci: Factor out initial setup script for Windows external test jobs
3532823dd7 ci: De-duplicate Windows test script for NMake job
3f1a1bad76 ci: De-duplicate Windows test script for JOM job
e2cf20e58c ci: De-duplicate Windows test script for Borland jobs
8af9a52d3e ci: De-duplicate Windows test script for MSVC v71 NMake job
430aa379d4 ci: De-duplicate Windows test script for OpenWatcom job

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8398
2023-04-06 09:10:56 -04:00
Brad King
3f68cb080f Merge topic 'FindOpenSSL-mingw'
248689f9bf FindOpenSSL: Fix finding header files and static libraries on MinGW

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8394
2023-04-06 09:09:42 -04:00
Brad King
2164803240 Merge branch 'release-3.26' 2023-04-06 09:06:44 -04:00
Brad King
e96f56708f Merge topic 'doc-typo'
045fbbb47c Help: Remove duplicated word in COMPILE_OPTIONS target property docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8396
2023-04-06 09:06:44 -04:00
Brad King
35c8f504ae Merge topic 'doc-typo' into release-3.26
045fbbb47c Help: Remove duplicated word in COMPILE_OPTIONS target property docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8396
2023-04-06 09:06:43 -04:00
Brad King
ebe79736f7 Merge branch 'release-3.26' 2023-04-06 09:05:50 -04:00
Brad King
8b9c2b0009 Merge topic 'FindCUDAToolkit-nvptxcompiler_static-deps'
8711231739 FindCUDAToolkit: nvptxcompiler_static correctly specify dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8395
2023-04-06 09:05:50 -04:00
Brad King
038cd7f620 Merge topic 'FindCUDAToolkit-nvptxcompiler_static-deps' into release-3.26
8711231739 FindCUDAToolkit: nvptxcompiler_static correctly specify dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8395
2023-04-06 09:05:49 -04:00