Commit Graph

56253 Commits

Author SHA1 Message Date
Brad King
cacf4eda69 Merge topic 'ci-clang-windows'
90ef30c09d ci: Explicitly disable Java tests on Windows Clang builds

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6972
2022-02-11 09:10:52 -05:00
Kitware Robot
f83d1115e5 CMake Nightly Date Stamp 2022-02-11 00:01:15 -05:00
Brad King
90ef30c09d ci: Explicitly disable Java tests on Windows Clang builds
Extend the change from commit 840fa28d3d (ci: Explicitly disable Java
tests on Windows, 2021-12-16) to cover LLVM/Clang builds on Windows too.
2022-02-10 09:20:05 -05:00
Brad King
663296ab4f Merge branch 'release-3.23' 2022-02-10 09:14:04 -05:00
Brad King
5d9fe41152 Merge branch 'release-3.22' 2022-02-10 09:14:02 -05:00
Brad King
213a4c4083 Merge branch 'release-3.21' 2022-02-10 09:14:00 -05:00
Brad King
0a08377c4a Merge branch 'release-3.22' into release-3.23 2022-02-10 09:13:51 -05:00
Brad King
32ed1b591c Merge branch 'release-3.23' 2022-02-10 09:11:14 -05:00
Brad King
fe5b2e8beb Merge topic 'doc-if-AND-OR' into release-3.23
41adfc6b04 Help: Clarify precedence of AND and OR in 'if' conditions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6970
2022-02-10 09:11:13 -05:00
Brad King
cd71d7f663 Merge topic 'doc-if-AND-OR'
41adfc6b04 Help: Clarify precedence of AND and OR in 'if' conditions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6970
2022-02-10 09:11:13 -05:00
Brad King
90a77c60b3 Merge branch 'release-3.23' 2022-02-10 09:09:10 -05:00
Brad King
5593a5d978 Merge topic 'clang-cross-compile-windows-pdb'
641cb1093b Windows/Clang: Support PDB when cross-compiling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !6959
2022-02-10 09:09:10 -05:00
Brad King
5b480172c3 Merge topic 'clang-cross-compile-windows-pdb' into release-3.23
641cb1093b Windows/Clang: Support PDB when cross-compiling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !6959
2022-02-10 09:09:09 -05:00
Brad King
ea73332145 Merge branch 'release-3.23' 2022-02-10 09:07:35 -05:00
Brad King
069d836dab Merge topic 'restore-target-export-includes'
83d79636bf install(TARGETS): Restore per-export INCLUDES DESTINATION

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6969
2022-02-10 09:07:35 -05:00
Brad King
5a65e08644 Merge topic 'restore-target-export-includes' into release-3.23
83d79636bf install(TARGETS): Restore per-export INCLUDES DESTINATION

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6969
2022-02-10 09:07:34 -05:00
Brad King
9ac2b3db01 Merge branch 'release-3.23' 2022-02-10 08:50:09 -05:00
Brad King
fdbc00fc47 Merge topic 'IntelLLVM-depfile-flags' into release-3.23
1e947fcb83 Merge branch 'backport-IntelLLVM-depfile-flags' into IntelLLVM-depfile-flags
a8b6bf9a38 IntelLLVM: Add dependencies on system header files on Windows
94f1bbdd54 Intel: Add dependencies on system header files on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6964
2022-02-10 08:50:08 -05:00
Brad King
cfa04b36fd Merge topic 'IntelLLVM-depfile-flags'
1e947fcb83 Merge branch 'backport-IntelLLVM-depfile-flags' into IntelLLVM-depfile-flags
a8b6bf9a38 IntelLLVM: Add dependencies on system header files on Windows
94f1bbdd54 Intel: Add dependencies on system header files on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6964
2022-02-10 08:50:08 -05:00
Brad King
a01132b6df Merge branch 'release-3.23' 2022-02-10 08:48:23 -05:00
Brad King
e6618f3baf Merge topic 'doc-MSVC_TOOLSET_VERSION-v143'
dca3a032d1 Help: Add MSVC_TOOLSET_VERSION value for v143 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6966
2022-02-10 08:48:22 -05:00
Brad King
d231d66082 Merge topic 'doc-MSVC_TOOLSET_VERSION-v143' into release-3.23
dca3a032d1 Help: Add MSVC_TOOLSET_VERSION value for v143 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6966
2022-02-10 08:48:21 -05:00
Kitware Robot
df741a36f4 CMake Nightly Date Stamp 2022-02-10 00:01:20 -05:00
Brad King
41adfc6b04 Help: Clarify precedence of AND and OR in 'if' conditions
The wording update in commit b74819e4fe (Help: Format 'if' command
documentation, 2013-12-18, v3.0.0-rc1~227^2~1) incorrectly implied that
`AND` has higher precedence than `OR`.  Although this is common in many
languages, it has never been true in CMake's implementation.  Revise
the wording to clarify the precedence.

Add a test case demonstrating the order.

Fixes: #23207
2022-02-09 14:24:43 -05:00
Eugene Shalygin
83d79636bf install(TARGETS): Restore per-export INCLUDES DESTINATION
In commit 55e4753bbb (Refactor cmTargetExport removing
InterfaceIncludeDirecories, 2021-07-20, v3.22.0-rc1~337^2~1) the storage
of `INCLUDES DESTINATION` was moved into each target.  However, a target
may be installed in multiple exports, and their `INCLUDES DESTINATION`
should not be mixed.

Convert the IncludeDirectoriesEntries vector to a map and modify access
function to store the directories lists with respect to cmExportTarget
object. This fixes error when the same target is exported more than once
via different exports and each for consequent export its include
directories list grows. Add a test for this case.

Fixes: #23183
2022-02-09 13:31:26 -05:00
Brad King
21d8a86804 Merge branch 'release-3.21' into release-3.22 2022-02-09 10:09:55 -05:00
Brad King
1a30d3ade5 Merge branch 'backport-IntelLLVM-depfile-flags' into release-3.22
Merge-request: !6964
2022-02-09 10:09:51 -05:00
Brad King
be20a94fac Merge branch 'backport-IntelLLVM-depfile-flags' into release-3.21
Merge-request: !6964
2022-02-09 10:09:28 -05:00
Brad King
1e947fcb83 Merge branch 'backport-IntelLLVM-depfile-flags' into IntelLLVM-depfile-flags 2022-02-09 10:08:52 -05:00
William R. Dieter
a8b6bf9a38 IntelLLVM: Add dependencies on system header files on Windows
In commit a90d2a9eed (IntelLLVM: Add support for Intel LLVM-based
compilers, 2020-11-02, v3.20.0-rc1~89^2~20) the IntelLLVM depfile
generation flags were taken from `Platform/Windows-Intel-C`.  Those
flags were added by commit a624a3e1b3 (Ninja: Use deps=gcc for Intel
Compiler on Windows, 2019-01-30, v3.14.0-rc1~30^2), which forgot to
account for commit 6d74e7870b (Ninja: Add dependencies on
system-provided header files, 2016-03-15, v3.6.0-rc1~265^2).

The `-QMD` option generates Makefile dependencies.  The `-QMMD` option
generates Makefile dependencies, but excludes system header files.
Part of the BuildDepends test includes a header, cmake_pch.hxx, that
includes a second header, zot_pch.hxx.  The test builds a pch file for
cmake_pch.hxx, touches zot_pch.hxx, then verifes that cmake_pch.hxx.pch
is regenerated based on the dependencies.

The cmake_pch.hxx contains `#pragma system_header` before it includes
zot_pch.hxx.  `#pragma system_header` indicates that the portion of the
file following the pragma is to be treated as a system header.

When `-QMMD` is used to generate dependencies, the `#include` of
zot_pch.hxx is ignored because it `-QMMD` says to ignore system headers.

Using `-QMD` instead uses all headers when generating dependencies
and causes this test to pass.  The Clang configuration in
Platform/Windows-Clang.cmake also uses the `-MD` option for generating
pre-compiled headers, instead of `-MMD`.

Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
2022-02-09 10:07:51 -05:00
Brad King
94f1bbdd54 Intel: Add dependencies on system header files on Windows
In commit a624a3e1b3 (Ninja: Use deps=gcc for Intel Compiler on Windows,
2019-01-30, v3.14.0-rc1~30^2) we forgot to account for commit 6d74e7870b
(Ninja: Add dependencies on system-provided header files, 2016-03-15,
v3.6.0-rc1~265^2).
2022-02-09 10:07:51 -05:00
Brad King
298bf1ed9d Merge branch 'doc-MSVC_TOOLSET_VERSION-v143' into release-3.22
Merge-request: !6966
2022-02-09 09:54:44 -05:00
Brad King
4423fa2b38 Merge branch 'doc-MSVC_TOOLSET_VERSION-v143' into release-3.21
Merge-request: !6966
2022-02-09 09:54:18 -05:00
Heiko Thiel
dca3a032d1 Help: Add MSVC_TOOLSET_VERSION value for v143 toolset
This was accidentally left out of commit f01ea7e391 (MSVC: Fix
MSVC_TOOLSET_VERSION for VS 2022 v143 toolset, 2019-04-03,
v3.21.3~10^2~1).
2022-02-09 09:53:11 -05:00
Brad King
e40cea3fe9 Merge topic 'genex-LINK_LIBRARY-to-decorate-library'
2a6b0415d7 $<LINK_LIBRARY>: Add LINK_LIBRARY_OVERRIDE target property
42965799b4 Genex: Add $<LINK_LIBRARY:...>
78dd7d5292 cmRulePlaceholderExpander: add base class for placeholder expansion reuse
4b55828a9f cmExpandListWithBacktrace: add handling of empty elements.
28d7432468 cmComputeLinkInformation: use cmComputeLinkDepends::LinkEntry

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6769
2022-02-09 09:28:20 -05:00
Brad King
3d5466d5e9 Merge topic 'trace-global-frame'
a41d6e4d7a Trace: add global_frame field to json-v1 format

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6954
2022-02-09 09:04:43 -05:00
Brad King
25003baf50 Merge topic 'vs_buildcache_support'
b764c7c273 VS: Add property to turn off Visual Studio compile batching

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6957
2022-02-09 08:59:45 -05:00
Brad King
2c553c56b4 Merge topic 'ci-intel-compiler'
3fe20db126 gitlab-ci: add jobs testing Intel 2022.0.2 compilers on Linux
6675fdd5c9 gitlab-ci: add jobs testing Intel 2021.4.0 compilers on Linux
ce8d471d94 gitlab-ci: add jobs testing Intel 2021.3.0 compilers on Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6962
2022-02-09 08:57:49 -05:00
Brad King
dfb56321ea Merge topic 'ci-clang-windows'
6bda940c25 ci: Add nightly CI job for clang++ with NMake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6961
2022-02-09 08:57:05 -05:00
Brad King
419eb2349a Merge topic 'test-vcs'
7b23fd6c1b Tests: Run CTest.UpdateBZR tests only if explicitly enabled
7cf5355d5e Tests: Add cache entries to control ExternalProject test VCS tools
c8b29dc5b9 Tests: Add cache entries to control existence of CTest.Update* tests
a70864e300 Tests: Make condition for CTest.UpdateCVS match pattern of other tools
1972a75536 Tests: Drop CTestUpdate.BZR test check for xmloutput plugin
f2566f6416 Tests: Drop unnecessary check for FindCVS module
530242576c Tests: Remove always-true condition enabling CTest.Update* tests
4e88a4228e Tests: Remove unused CVS tool discovery

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6956
2022-02-09 08:54:38 -05:00
Kitware Robot
d7ee1145a1 CMake Nightly Date Stamp 2022-02-09 00:01:13 -05:00
Deniz Bahadir
641cb1093b Windows/Clang: Support PDB when cross-compiling 2022-02-09 00:38:09 +01:00
Brad King
3fe20db126 gitlab-ci: add jobs testing Intel 2022.0.2 compilers on Linux
Note that the classic compiler version is 2021.5.0, but we still
have it in the 2022.0.2 base image.
2022-02-08 13:57:05 -05:00
Brad King
37e462aaa7 Merge branch 'release-3.23' 2022-02-08 11:23:05 -05:00
Brad King
a15cc7706d CMake 3.23.0-rc1 v3.23.0-rc1 2022-02-08 10:43:14 -05:00
Brad King
f25f6d2ed9 Merge branch 'release-3.23' 2022-02-08 10:42:18 -05:00
Brad King
d831c0873a Merge branch 'release-3.22' 2022-02-08 10:42:16 -05:00
Brad King
0167dc0b1b Merge branch 'release-3.22' into release-3.23 2022-02-08 10:41:59 -05:00
Brad King
cd278525ba Merge branch 'release-3.23' 2022-02-08 10:41:18 -05:00
Brad King
dc1e84c915 Merge topic 'FindGSL-version-regex'
b67ff61c3a FindGSL: Improve version extraction regex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6960
2022-02-08 10:41:18 -05:00