59640 Commits

Author SHA1 Message Date
Brad King
e2be23a2b3 CMake 3.25.2 v3.25.2 2023-01-19 09:32:19 -05:00
Brad King
8d1705dbd2 Merge branch 'backport-FindCUDAToolkit-cuda-12-nvToolsExt' into release-3.25
Merge-request: !8076
2023-01-17 09:59:31 -05:00
Brad King
74da1d1a8f Merge branch 'release-3.24' into release-3.25 2023-01-17 09:16:54 -05:00
Brad King
4465e1ea31 Merge topic 'doc-header-only' into release-3.25
93696d0f2e Help: Restore cmake-buildsystem(7) header-only library example

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8071
2023-01-17 09:16:08 -05:00
Robert Maynard
eb4de10075 FindCUDAToolkit: Handle CUDA::nvToolsExt not existing
Fixes #24275
2023-01-16 09:43:43 -05:00
Brad King
c0a8ffb008 Merge branch 'doc-header-only' into release-3.24
Merge-request: !8071
2023-01-13 10:45:15 -05:00
Brad King
93696d0f2e Help: Restore cmake-buildsystem(7) header-only library example
Since commit 4391913133 (Add INTERFACE libraries to generated
buildsystem if they have SOURCES, 2020-07-20, v3.19.0-rc1~346^2~1) the
"Eigen" example in the `cmake-buildsystem(7)` manual is supposed to show
a header-only library in which the headers are attached as sources to be
edited in IDEs.  This was accidentally broken by commit 4b25a0d512
(Help/manual: Update header-only library example, 2022-04-22,
v3.24.0-rc1~220^2) when updating the example to use a `FILE_SET`.

Fixes: #24319
2023-01-13 10:42:56 -05:00
Brad King
e35255f2a5 Merge topic 'try_run-cross-compile' into release-3.25
2f85ec0a37 try_run: Avoid crash in keyword-dispatched signature when cross-compiling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8066
2023-01-13 08:47:19 -05:00
Brad King
2d9e66a23b Merge topic 'implicit-includes' into release-3.25
607bccb4ef Restore implicit include directory extraction for adaptive relative paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8067
2023-01-13 08:45:37 -05:00
Brad King
45da44cc23 Merge topic 'IntelLLVM-msvc-no-cxx11' into release-3.25
88f9fdcb03 IntelLLVM: Avoid unnecessary -Qstd=c++11 flag on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8069
2023-01-13 08:43:29 -05:00
Brad King
97b4a0f5e3 Merge branch 'release-3.24' into release-3.25 2023-01-13 08:41:23 -05:00
Brad King
5cb5d3f17b Merge topic 'IntelLLVM-no-icpx-on-Windows' into release-3.25
870d89627f Help: Clarify compiler id distinction between Intel Classic and IntelLLVM
ea4cfb3b53 Merge branch 'backport-IntelLLVM-no-icpx-on-Windows'
8834e4d6a5 IntelLLVM: Avoid finding not-yet-supported icpx on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8041
2023-01-13 08:39:40 -05:00
Brad King
88f9fdcb03 IntelLLVM: Avoid unnecessary -Qstd=c++11 flag on Windows
The IntelLLVM compiler, for compatibility with MSVC on Windows, always
runs with support for at least C++14.  The `-Qstd=c++11` flag just
causes a warning that it is unused.

Fixes: #24316
2023-01-12 15:58:14 -05:00
Brad King
607bccb4ef Restore implicit include directory extraction for adaptive relative paths
Update the logic added by commit ef41d49812 (Fix implicit include
directory extraction for adaptive relative paths, 2019-04-08,
v3.14.2~5^2) to account for the new `try_compile` work directory used
for the ABI check since commit 2edf0fc6d7 (Modules: Use new
keyword-dispatched try_compile signature, 2022-09-13,
v3.25.0-rc1~144^2).

Paths relative to the work directory will now have one more `../`
in them, so update the test data to match.

Fixes: #24279
2023-01-12 12:05:42 -05:00
Brad King
2f85ec0a37 try_run: Avoid crash in keyword-dispatched signature when cross-compiling
Since commit aa9220d3a0 (try_compile: Add keyword-dispatched signature,
2022-09-02, v3.25.0-rc1~178^2) the `DoNotRunExecutable` code path may be
reached with no single source-file argument.  Do not assume it exists.

Fixes: #24295
2023-01-12 11:04:16 -05:00
Brad King
e15253a94b Merge branch 'release-3.23' into release-3.24 2023-01-12 10:33:55 -05:00
Brad King
76ab7cb79f Merge branch 'backport-IntelLLVM-no-icpx-on-Windows' into release-3.24
Merge-request: !8041
2023-01-12 10:33:50 -05:00
Brad King
878e8d2f4a Merge branch 'backport-IntelLLVM-no-icpx-on-Windows' into release-3.23
Merge-request: !8041
2023-01-12 10:33:30 -05:00
Michael Hirsch
870d89627f Help: Clarify compiler id distinction between Intel Classic and IntelLLVM 2023-01-12 10:24:15 -05:00
Brad King
ea4cfb3b53 Merge branch 'backport-IntelLLVM-no-icpx-on-Windows' 2023-01-12 10:24:06 -05:00
Michael Hirsch
8834e4d6a5 IntelLLVM: Avoid finding not-yet-supported icpx on Windows
Intel oneAPI 2023.0 added the `icpx` compiler front-end on Windows.
It uses a GNU-like command-line, and is not yet supported by CMake.
Avoid finding `icpx` as the CXX compiler on Windows until support
is added.

Fixes: #24266
Issue: #24314
2023-01-12 10:23:38 -05:00
Brad King
6b92224f6c Merge topic 'FindBoost-1.81' into release-3.25
a97032c4e7 FindBoost: Add Boost 1.81 support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Christoph Grüninger <foss@grueninger.de>
Merge-request: !8056
2023-01-12 09:20:05 -05:00
Brad King
592939ef74 Merge branch 'release-3.24' into release-3.25 2023-01-12 09:18:36 -05:00
Brad King
8e87e016ce Merge topic 'fix-cmzlib-crc32-fn-mangling' into release-3.25
7d92e363a2 zlib: Fix typo in mangling the crc32() function

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8049
2023-01-12 09:17:52 -05:00
Brad King
05dffe6e84 Merge branch 'fix-cmzlib-crc32-fn-mangling' into release-3.24
Merge-request: !8049
2023-01-12 09:15:59 -05:00
leha-bot
a97032c4e7 FindBoost: Add Boost 1.81 support
Update the list of known versions.

There is a new header-only library, Boost.URL. It has no
dependencies and has a core header `<boost/url.hpp>`.

Run the command

    cmake -DBOOST_DIR=/path/to/boost_1_81_0 \
      -P Utilities/Scripts/BoostScanDeps.cmake

to extract dependencies from the 1.81.0 source tree.
They are the same as 1.80's dependencies, so just update
the version check for warning about newer versions.
2023-01-11 17:31:33 -05:00
leha-bot
7d92e363a2 zlib: Fix typo in mangling the crc32() function
Fix the mangling of `crc32` by commit 29c578c8fb (zlib: Mangle symbols
to avoid conflict with external transitive dependencies, 2022-06-10,
v3.24.0-rc1~7^2).

Fixes: #24281
2023-01-11 17:29:04 -05:00
Brad King
f77cca61dc Merge branch 'release-3.24' into release-3.25 2023-01-11 17:27:10 -05:00
Brad King
2e474823ce Merge branch 'test-git-local-defaultBranch' into release-3.25
Merge-request: !8060
2023-01-11 17:27:04 -05:00
Brad King
33cf87619b Merge branch 'test-git-local-defaultBranch' into release-3.24
Merge-request: !8060
2023-01-11 17:13:40 -05:00
Brad King
baa8597076 Tests: Fix CTest.UpdateGIT under repo-local defaultBranch config
The default branch detection added by commit 26ec2e2b0c (Tests: Update
CTest.UpdateGIT test for custom defaultBranch, 2020-12-02,
v3.20.0-rc1~355^2) fails if the test is run inside a Git work tree whose
`.git` directory configures a `defaultBranch` that is different from the
global or system-wide value.  Fix the detection to ignore the locally
configured value so that we match the `git init` decision.
2023-01-11 17:11:34 -05:00
Craig Scott
7aed5f74b2 Merge topic 'doc-SYSTEM' into release-3.25
dfab263825 Help: Clarify and update SYSTEM-related docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8027
2022-12-19 15:57:21 -05:00
Craig Scott
a776857dc6 Merge topic 'code-comment-typos' into release-3.25
a817948423 Code comments: Fix trivial typos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8030
2022-12-19 15:14:17 -05:00
Marc Chevrier
06f58a802c Merge topic 'doc-updates' into release-3.25
22d36aa0f8 Help: string(JSON): avoid duplicate labels

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8028
2022-12-18 08:06:26 -05:00
Craig Scott
a817948423 Code comments: Fix trivial typos 2022-12-18 09:47:11 +11:00
Marc Chevrier
22d36aa0f8 Help: string(JSON): avoid duplicate labels 2022-12-17 12:42:36 +01:00
Craig Scott
dfab263825 Help: Clarify and update SYSTEM-related docs 2022-12-17 20:51:25 +11:00
Craig Scott
94131d632f Merge topic 'doc-updates' into release-3.25
2ee845c0a5 Help: Add version information for SYSTEM option of add_subdirectory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8025
2022-12-17 04:49:59 -05:00
Brad King
1114767ac1 Merge topic 'masm-debug-format' into release-3.25
a9bd1e34ef VS: Do not enable ASM_MASM debug information unless requested
98ba122a30 ASM_MASM: Populate MSVC debug information format abstraction table

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8022
2022-12-16 08:55:22 -05:00
Brad King
ca9f3f4db7 Merge branch 'release-3.24' into release-3.25 2022-12-16 08:50:39 -05:00
Brad King
0148923b5b Merge topic 'ci-xcode-14.2' into release-3.25
85d2ce0bfe gitlab-ci: update macOS jobs to use Xcode 14.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8023
2022-12-16 08:49:48 -05:00
Brad King
bf7ff59292 Merge branch 'ci-xcode-14.2' into release-3.24
Merge-request: !8023
2022-12-16 08:49:05 -05:00
Marc Chevrier
2ee845c0a5 Help: Add version information for SYSTEM option of add_subdirectory 2022-12-16 14:05:43 +01:00
Brad King
85d2ce0bfe gitlab-ci: update macOS jobs to use Xcode 14.2 2022-12-15 17:43:58 -05:00
Brad King
a9bd1e34ef VS: Do not enable ASM_MASM debug information unless requested
MSBuild enables debug information with MASM by default, but for us
that is not consistent with behavior on other generators.
2022-12-15 11:53:40 -05:00
Brad King
98ba122a30 ASM_MASM: Populate MSVC debug information format abstraction table
In commit 0e96a20478 (MSVC: Add abstraction for debug information
format, 2022-08-25, v3.25.0-rc1~142^2~1) we overlooked populating the
runtime library selection flags for the Microsoft assembler.  Its
compiler id is `MSVC`, so our generators expect the table to be
populated.  It only supports `Embedded` debug info.  Use empty flags for
the other formats.

Without this fix, enabling the `ASM_MASM` language with policy `CMP0141`
set to `NEW` causes an error due to the missing table entries.

Fixes: #24249
2022-12-15 11:53:11 -05:00
Brad King
2d3ed58cee Merge topic 'cuda-nvcc-cuda20' into release-3.25
0aeeb8160c CUDA: Add support for cuda_std_20 for nvcc 12.0+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8008
2022-12-14 08:58:54 -05:00
Robert Maynard
0aeeb8160c CUDA: Add support for cuda_std_20 for nvcc 12.0+
CUDA 12.0 has been released with support for `-std=c++20`.
2022-12-13 10:18:15 -05:00
Brad King
6db3519c41 Merge topic 'ccmake-aix-curses' into release-3.25
d91d9ec431 ccmake: Restore compilation with AIX curses.h

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8001
2022-12-08 07:58:06 -05:00
Brad King
d91d9ec431 ccmake: Restore compilation with AIX curses.h
On AIX, including `<curses.h>` includes `<term.h>` which defines
a bunch of non-prefixed, lower-case macro names.  Undefine one
that conflicts with our source code.

Fixes: #24229
2022-12-07 17:57:28 -05:00