Commit Graph

59614 Commits

Author SHA1 Message Date
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
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
Brad King
8bf724f756 Merge topic 'doc-SYSTEM' into release-3.25
b15b9cf286 Help: Clarify SYSTEM property default for imported targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7990
2022-12-07 08:12:04 -05:00
Brad King
4d07327c7c Merge topic 'ci-os-arch' into release-3.25
2bf1ce6cc3 gitlab-ci: drop unnecessary linux kernel version tag on 3.25 release branch
429574a94e gitlab-ci: replace '$os' tags with '$os-x86_64' on 3.25 release branch

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7995
2022-12-06 13:55:49 -05:00
Brad King
2bf1ce6cc3 gitlab-ci: drop unnecessary linux kernel version tag on 3.25 release branch
All our CI hosts now have Linux kernel version 3.17 or higher,
so we no longer need a dedicated tag.

This backports commit c212c7dc8b (gitlab-ci: drop unnecessary linux
kernel version tag, 2022-11-30) to the 3.25 release branch.
2022-12-06 13:27:39 -05:00
Brad King
429574a94e gitlab-ci: replace '$os' tags with '$os-x86_64' on 3.25 release branch
The latter tags are now available on our CI runners to more explicitly
distinguish `linux-x86_64` from `linux-aarch64` and to distinguish
`{macos,windows}-x86_64` from `{macos,windows}-arm64`.

This backports commit 33fe37a660 (gitlab-ci: replace '{macos,windows}'
tags with '{macos,windows}-x86_64', 2022-11-30) and commit 94d82d91d5
(gitlab-ci: replace 'linux' tags with 'linux-x86_64', 2022-11-30) to
the 3.25 release branch.
2022-12-06 13:24:07 -05:00
Brad King
b15b9cf286 Help: Clarify SYSTEM property default for imported targets
The `SYSTEM` directory property does not affect imported targets.

Fixes: #24219
2022-12-05 19:42:06 -05:00
Brad King
60fc165dcb Merge topic 'CheckSymbolExists-restore-newline' into release-3.25
9273b8f421 CheckSymbolExists: Restore newline at end of test source

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Petr Nechaev <petr.nechaev@cogentembedded.com>
Merge-request: !7979
2022-12-05 12:51:23 -05:00
Craig Scott
2d74078d37 Merge topic 'FetchContent-SYSTEM' into release-3.25
4b85141f83 FetchContent: Don't pass SYSTEM through to sub-build

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7977
2022-12-05 06:23:27 -05:00
Andrey Vostrikov
9273b8f421 CheckSymbolExists: Restore newline at end of test source
Refactoring in commit db76876db5 (Modules: Use new SOURCES_FROM_*
try_compile (1/2), 2022-09-26, v3.25.0-rc1~74^2~1) accidentally dropped
the final newline of the test source, which was previously provided by
the input to `configure_file`.  The C standard requires a newline at the
end of file, so add one explicitly.

Signed-off-by: Andrey Vostrikov <andrey.vostrikov@cogentembedded.com>
2022-12-02 09:20:09 -05:00
Craig Scott
4b85141f83 FetchContent: Don't pass SYSTEM through to sub-build
If we don't filter out SYSTEM from the arguments we pass
through to ExternalProject_Add(), it gets appended as a
list item to whatever arguments precede it because
ExternalProject_Add() doesn't recognize it as a keyword.

Fixes: #24201
2022-12-02 18:41:18 +11:00
Brad King
0b6bfb1ed8 Merge branch 'release-3.24' into release-3.25 2022-11-30 09:58:46 -05:00
Brad King
9c29d00393 Merge branch 'rel-win-sign-digest' into release-3.24
Merge-request: !7970
2022-11-30 09:58:26 -05:00
Brad King
d9c3433a30 Merge topic 'rel-win-sign-digest' into release-3.25
870f30aacc Utilities/Release: Use explicit digest for Win7-compatible signature

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7970
2022-11-30 09:57:46 -05:00
Brad King
870f30aacc Utilities/Release: Use explicit digest for Win7-compatible signature
Otherwise `signtool` warns.
2022-11-30 09:16:22 -05:00
Brad King
5676593be9 CMake 3.25.1 v3.25.1 2022-11-30 08:57:03 -05:00
Brad King
39af69ac39 Merge topic 'fortran-regression' into release-3.25
a67da2ef66 Tests/FortranModules: add case for modules after "end interface X"
88fb1980c3 Fortran: Restore support for parsing "end interface X"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7966
2022-11-30 08:55:58 -05:00
Ben Boeckel
a67da2ef66 Tests/FortranModules: add case for modules after "end interface X"
When there is an `end interface X` in a file, subsequent modules should
not be considered part of interface X.

Issue: #24203
2022-11-30 06:39:48 -05:00
Brad King
88fb1980c3 Fortran: Restore support for parsing "end interface X"
Since commit 219a9b1e14 (Fortran: Fix suprious dependencies with
submodules, 2022-07-30, v3.25.0-rc1~327^2) we accidentally fail to
recognize `end interface X`, causing all subsequent modules to be seen
as an interface.

Fixes: #24203
2022-11-30 06:38:36 -05:00
Brad King
3f05665a3f Merge topic 'source-from-var' into release-3.25
f6b99c5087 Check*: Restore support for arbitrary result variable names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7960
2022-11-29 10:27:25 -05:00
Brad King
0da7ec03dd Merge topic 'FindRuby-doc-fix' into release-3.25
0d7f40a5c4 FindRuby: Remove documentation for non-existent Ruby_ROOT_DIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7954
2022-11-29 10:25:39 -05:00
Brad King
7eb3cb19bc Merge topic 'android-no-LINUX' into release-3.25
19509249a5 Android: Revert setting LINUX variable on Android target systems

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Nevala <robert.nevala@king.com>
Acked-by: n00b42 <github.com@mail.msdigital.de>
Merge-request: !7963
2022-11-29 10:24:21 -05:00
Brad King
51235d14eb Merge topic 'msvc-cxx-no-optin-experimental-flag' into release-3.25
12e4bc73cb MSVC: don't opt into dyndep support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7965
2022-11-29 10:22:47 -05:00
Brad King
4c2952c5cb Merge topic 'revert-find_library-msvc-libfoo.a' into release-3.25
955d6245c1 MSVC: Revert "Teach find_library to consider the 'libfoo.a' naming convention"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7962
2022-11-29 10:15:55 -05:00
Brad King
30e5ef9659 Merge branch 'release-3.24' into release-3.25 2022-11-29 10:13:42 -05:00
Brad King
25f6f98eb1 Merge topic 'mingw-windres' into release-3.25
b47092fddb MinGW: Fix regression when windres is not found

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7964
2022-11-29 10:06:52 -05:00
Brad King
0674870892 Merge branch 'mingw-windres' into release-3.24
Merge-request: !7964
2022-11-28 19:10:20 -05:00
Brad King
b47092fddb MinGW: Fix regression when windres is not found
The fix in commit e9755bc7c1 (MinGW: Restore using windres when
toolchain-prefixed name is not available, 2022-08-15, v3.24.1~4^2)
incorrectly listed two entries in `CMAKE_RC_COMPILER_INIT`, which is
only meant to have one value.  Revise the logic to support multiple
platform-specific names for the Windows Resource Compiler while still
only using one name as the fallback when it is not found.

Fixes: #24190
Issue: #23841
2022-11-28 19:09:04 -05:00