Commit Graph

56090 Commits

Author SHA1 Message Date
Kyle Edwards c18409cdac CMakePresets.json: Ensure configurePreset is reachable from current file 2022-02-02 15:17:30 -05:00
Brad King 9245925810 Merge topic 'cuda_generic_arch_all'
8f64df0a7c CUDA: Generic all and all-major support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !6816
2022-02-02 08:23:19 -05:00
Brad King 0f316675cf Merge topic 'dotnet_ref_in_sdk'
5ee3154f65 VS: .Net SDK Style projects can add Reference to dlls

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6932
2022-02-02 08:21:16 -05:00
Brad King 490e58905d Merge topic 'update-expat'
338240fd21 Merge branch 'upstream-expat' into update-expat
8e0070b905 expat 2022-01-30 (81b89678)
f06a4c2406 expat: Update script to get Expat 2.4.4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6933
2022-02-02 08:18:45 -05:00
Brad King 1e1e04db75 Merge topic 'ep-redownload-on-SOURCE_DIR-change'
d3477eba06 ExternalProject: Rerun download on SOURCE_DIR change

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6926
2022-02-02 08:17:51 -05:00
Brad King 9e76b4cde6 Merge topic 'ci-fedora35'
c76abba044 gitlab-ci: update to Fedora 35 base images
0ab6e5ca5b gitlab-ci: update to Fedora 35 for upload jobs
1729e1292d ci: update to Fedora 35 for Linux base images
89700cba9a clang-tidy: ignore warnings new in version 13
efe3af0119 Tests: Update FindBoost.TestPython for Python 3.10
a541c8f510 Utilities/Sphinx: Ignore warning in generated texinfo documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6935
2022-02-02 08:16:46 -05:00
Kitware Robot ece32491ab CMake Nightly Date Stamp 2022-02-02 00:01:17 -05:00
Brad King c76abba044 gitlab-ci: update to Fedora 35 base images 2022-02-01 17:20:29 -05:00
Brad King 0ab6e5ca5b gitlab-ci: update to Fedora 35 for upload jobs 2022-02-01 17:20:29 -05:00
Brad King 1729e1292d ci: update to Fedora 35 for Linux base images 2022-02-01 17:20:29 -05:00
Brad King 89700cba9a clang-tidy: ignore warnings new in version 13
These warnings can be fixed in the future.  Ignore them for now.
2022-02-01 17:20:29 -05:00
Brad King efe3af0119 Tests: Update FindBoost.TestPython for Python 3.10
Follow up commit d4bb6c0c7f (FindBoost: Add support for Python 3.10,
2021-12-16, v3.22.2~14^2) with an update for the FindBoost test.
2022-02-01 17:20:28 -05:00
Brad King a541c8f510 Utilities/Sphinx: Ignore warning in generated texinfo documentation 2022-02-01 17:20:28 -05:00
Brad King 71294d482d Merge branch 'release-3.22' 2022-02-01 12:09:54 -05:00
Brad King 18881afbdf Merge branch 'release-3.21' 2022-02-01 12:09:43 -05:00
Brad King 17f97143cb Merge branch 'release-3.21' into release-3.22 2022-02-01 12:08:05 -05:00
Brad King c138ddb943 Merge topic 'refactor-find-package-cmake-ignore-path'
11f97d1968 find_package(): Refactor CMAKE_[SYSTEM_]IGNORE_PATH
30e5c1d92b find_package(): Add tests for CMAKE_IGNORE_PATH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6918
2022-02-01 12:04:33 -05:00
Raul Tambre 8f64df0a7c CUDA: Generic all and all-major support
Commit 14d8a276 (CUDA: Support nvcc 11.5 new -arch=all|all-major flags,
2021-08-17) added all and all-major options to CUDA_ARCHITECTURES. These are
fairly generic and likely to see real-world use by distributors. Thus it's
desirable to support these also for Clang and older NVCC versions.

The supported architectures are dependent on the toolkit version. We determine
the toolkit version prior to compiler detection. For NVCC we get the version
from the vendor identification output, but for Clang we need to invoke NVCC
separately.

The architecture information is mostly based on the Wikipedia list with the
earliest supported version being CUDA 7.0. This could be documented and
expanded in the future to allow projects to query CUDA toolkit version and
architecture information.
For Clang we additionally constrain based on its support.

Additionally the architecture mismatch detection logic is fixed, improved and
updated for generic support:
* Commit 01428c55 (CUDA: Fail fast if CMAKE_CUDA_ARCHITECTURES doesn't work
  during detection, 2020-08-29) enabled CMAKE_CUDA_COMPILER_ID_REQUIRE_SUCCESS
  if CMAKE_CUDA_ARCHITECTURES is specified. This results in
  CMakeDetermineCompilerID.cmake printing the compiler error and our code for
  presenting the mismatch in a user-friendly way being useless. The custom
  logic seems preferable so go back to not enabling it.
* Commit 14d8a276 (CUDA: Support nvcc 11.5 new -arch=all|all-major flags,
  2021-08-17) tried to support CMP0054 but forgot to add x to the interpolated
  result. Thus the conditions would always evaluate to false. This is fixed as
  a byproduct of removing NVIDIA specific checks, improving the error message
  and replacing architectures_mode with a simpler architectures_explicit.

Visual Studio support omits testing the flags during detection due to
complexities in determining the toolkit version when using it.
A long-term proper implementation would be #23161.

Implements #22860.
2022-02-01 18:25:20 +02:00
Brad King 6fe5df13c2 CMake 3.21.5 v3.21.5 2022-02-01 10:54:10 -05:00
Brad King 338240fd21 Merge branch 'upstream-expat' into update-expat
# By Expat Upstream
* upstream-expat:
  expat 2022-01-30 (81b89678)
2022-02-01 10:43:53 -05:00
Expat Upstream 8e0070b905 expat 2022-01-30 (81b89678)
Code extracted from:

    https://github.com/libexpat/libexpat.git

at commit 81b89678e200820271b72cacdd45fb5868855765 (R_2_4_4).
2022-02-01 10:43:53 -05:00
Brad King f06a4c2406 expat: Update script to get Expat 2.4.4 2022-02-01 10:43:39 -05:00
Brad King 012ea11ea4 Merge topic 'update-kwsys'
1e242a95d0 Merge branch 'upstream-KWSys' into update-kwsys
7d9204a7e2 KWSys 2022-01-31 (9fd1660a)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6930
2022-02-01 10:38:07 -05:00
Brad King 6bbbd42e19 Merge topic 'FindHDF5-imported-per-config'
db9d911db0 FindHDF5: Set config-specific locations for imported targets
d28e5263fe FindHDF5: Drop IMPORTED_IMPLIB property from imported UNKNOWN libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6931
2022-02-01 10:35:32 -05:00
Brad King 9d439dfd1b Merge topic 'feature/findruby-3x'
6b6bc7791d FindRuby: evict non-matching binaries and keep scanning.
42d99a248e FindRuby: add support for versions up to 3.1.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6925
2022-02-01 10:31:39 -05:00
Brad King e7e5ebd0e3 Merge topic 'cpack_nsis_no_description'
b56e0f4689 CPack/NSIS: Fix description not displayed for components

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6920
2022-02-01 10:30:55 -05:00
Brad King a9150aa35f Merge branch 'release-3.22' 2022-02-01 10:27:40 -05:00
Brad King 68ab7b187c Merge branch 'ci-assertions' into release-3.22
Merge-request: !6927
2022-02-01 10:27:24 -05:00
Brad King 4aedf84da3 Merge topic 'ci-assertions'
45feab3c00 gitlab-ci: enable assertions on fedora34-ninja jobs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6927
2022-02-01 10:25:50 -05:00
Sumit Bhardwaj 5ee3154f65 VS: .Net SDK Style projects can add Reference to dlls
When support for `DOTNET_SDK` was added, only a minimal set of options
were built in. Based on user feedback, support for reference to dlls
(not just projects) is needed. That support is added here.

Fixes: #23166
2022-02-01 07:18:03 -08:00
Brad King b96f1fb572 Merge branch 'release-3.22' 2022-02-01 09:51:51 -05:00
Brad King 79aa2c530a Merge branch 'release-3.21' into release-3.22 2022-02-01 09:51:43 -05:00
Brad King bd1b169f79 Merge branch 'release-3.21' 2022-02-01 09:51:26 -05:00
Brad King f30c0eff53 Merge branch 'release-3.20' 2022-02-01 09:51:14 -05:00
Brad King ba6d89ac5a Merge branch 'release-3.22' 2022-02-01 09:50:41 -05:00
Brad King 983df681c8 Merge topic 'help-try-compile-result-var'
34d263270e Help: Drop incorrect versionadded for try_compile result variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6923
2022-02-01 09:50:41 -05:00
Brad King cb66d25747 Merge topic 'help-try-compile-result-var' into release-3.22
34d263270e Help: Drop incorrect versionadded for try_compile result variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6923
2022-02-01 09:50:40 -05:00
Craig Scott d3477eba06 ExternalProject: Rerun download on SOURCE_DIR change
Fixes: #21748
2022-02-01 22:31:29 +11:00
Kitware Robot 0294570d06 CMake Nightly Date Stamp 2022-02-01 00:01:17 -05:00
Brad King db9d911db0 FindHDF5: Set config-specific locations for imported targets
Update the imported target locations added by commit a8e0a6b3e4
(FindHDF5: Port changes from VTK, 2020-06-10, v3.19.0-rc1~312^2~1) to
use config-specific locations.

Issue: #21637
2022-01-31 17:42:39 -05:00
Brad King d28e5263fe FindHDF5: Drop IMPORTED_IMPLIB property from imported UNKNOWN libraries
The imported targets added by commit a8e0a6b3e4 (FindHDF5: Port changes
from VTK, 2020-06-10, v3.19.0-rc1~312^2~1) to use config-specific
locations set the `IMPORTED_IMPLIB` target property.  That property has
no meaning for an imported library with type `UNKNOWN`.  Drop it to
avoid confusion.
2022-01-31 17:16:37 -05:00
Brad King 1e242a95d0 Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2022-01-31 (9fd1660a)
2022-01-31 15:27:01 -05:00
KWSys Upstream 7d9204a7e2 KWSys 2022-01-31 (9fd1660a)
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 9fd1660a9ddeaf9cb590bfd801c94a7a374ae94b (master).

Upstream Shortlog
-----------------

Aaron Liu (1):
      dc6b6641 testSystemTools: apply root-check on AIX
2022-01-31 15:27:00 -05:00
Brad King fc2735426d Merge branch 'release-3.20' into release-3.21 2022-01-31 11:36:57 -05:00
Brad King d647ca1849 Merge branch 'help-try-compile-result-var' into release-3.21
Merge-request: !6923
2022-01-31 11:36:46 -05:00
Brad King d6bfce26ad Merge branch 'help-try-compile-result-var' into release-3.20
Merge-request: !6923
2022-01-31 11:35:58 -05:00
Brad King 45feab3c00 gitlab-ci: enable assertions on fedora34-ninja jobs
We should have at least one CI job in merge request pipelines that
builds CMake with assertions enabled.  We avoid using the `Debug`
configuration in order to keep CI artifacts small, so instead use
the `Release` configuration without `-DNDEBUG`.
2022-01-31 11:34:12 -05:00
friendlyanon 34d263270e Help: Drop incorrect versionadded for try_compile result variable
In commit c705279bae (Help: Add `.. versionadded` directives to commands
documentation, 2020-11-08, v3.20.0-rc1~508^2) we accidentally added
``versionadded`` markup suggesting that the first argument to
`try_compile` was fixed as `RESULT_VAR` prior to CMake 3.14.  This was
probably due to misinterpreting the change from commit 7975edeac5 (Help:
User-provided variable names for try_* commands, 2019-02-24,
v3.14.0-rc3~16^2~3).

The result variable has never been fixed.  Drop the incorrect markup.
2022-01-31 10:59:56 -05:00
Kyle Edwards 11f97d1968 find_package(): Refactor CMAKE_[SYSTEM_]IGNORE_PATH
In the old implementation, CMAKE_[SYSTEM_]IGNORE_PATH was handled
in cmFindCommon. Move it into cmFindPackageCommand.
2022-01-31 10:41:04 -05:00
Brad King 5305d5aa1a Merge topic 'link-interface-direct'
f3ad061858 Add usage requirements to update direct link dependencies
193a999cd5 cmTarget: Add INTERFACE_LINK_LIBRARIES_DIRECT{,_EXCLUDE} backtrace storage
22d5427aa6 cmGeneratorTarget: Add LookupLinkItem option to consider own target name
f3d2eab36a cmGeneratorTarget: Fix link interface caching of partial results
d75ab9d066 cmGeneratorTarget: Clarify CMP0022 logic in ComputeLinkInterfaceLibraries
f3e9e03fe0 cmGeneratorTarget: Simplify CMP0022 warning check
216aa14997 cmGeneratorTarget: Return early from ExpandLinkItems with no items
1bc98371d1 Tests: Remove unnecessary policy setting from ObjectLibrary test
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6886
2022-01-31 10:36:55 -05:00