Commit Graph

63226 Commits

Author SHA1 Message Date
Robert Maynard
aa8facefe8 CUDA: Visual Studio propagate objects to device linking
When given objects via `target_link_libraries(consumer PRIVATE producer)` the VisualStudio solution adds the objects
under as `<Object>` entries in the solution.

This works for host side linking but isn't handled by
the cuda msbuild extensions. So to work around this we
manually add the objects as additional link items.
2023-09-22 11:54:12 -04:00
Brad King
f83790af0b Merge topic 'fileset-private-dep'
ec2ba29ac5 Ninja: Allow compilation before generation of dependencies' private sources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8420
2023-09-21 09:39:56 -04:00
Brad King
8030dd0986 Merge topic 'findjava'
d95988c8c3 FindJNI: use modern foreach() syntax
7e4fe71633 FindJNI: use 2-space indents
88411fd629 FindJNI: use cmake_host_system_info to query registry
b56d4e041a FindJava: use cmake_host_system_info to query registry
bab9a23724 FindJava: use modern foreach() syntax

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8818
2023-09-21 08:07:18 -04:00
Brad King
6a9a738e99 Merge topic 'doc-find-arch-paths'
51c2927816 Help: Clarify requirements for find_package to use lib{64,32,x32} paths
e625255fe4 Help: Indent find_package REGISTRY_VIEW paragraphs together

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Roscoe A. Bartlett <rabartl@sandia.gov>
Merge-request: !8819
2023-09-21 08:06:16 -04:00
Brad King
8971bd4d1b Merge topic 'ci-cmake-update'
08d77470ef ci: Update CMake version to 3.27.6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8821
2023-09-21 08:03:55 -04:00
Brad King
aa92b1d0eb Merge topic 'ci-clang17-windows'
4c92fc709a ci: Update LLVM/Clang to 17.0 in nightly CI jobs on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8820
2023-09-21 08:03:02 -04:00
Kitware Robot
4ac624debc CMake Nightly Date Stamp 2023-09-21 00:01:19 -04:00
Kyle Edwards
08d77470ef ci: Update CMake version to 3.27.6 2023-09-20 15:06:46 -04:00
scivision
d95988c8c3 FindJNI: use modern foreach() syntax 2023-09-20 14:22:37 -04:00
scivision
7e4fe71633 FindJNI: use 2-space indents 2023-09-20 14:22:37 -04:00
scivision
88411fd629 FindJNI: use cmake_host_system_info to query registry 2023-09-20 14:22:37 -04:00
scivision
b56d4e041a FindJava: use cmake_host_system_info to query registry 2023-09-20 14:22:37 -04:00
scivision
bab9a23724 FindJava: use modern foreach() syntax 2023-09-20 14:22:30 -04:00
Brad King
51c2927816 Help: Clarify requirements for find_package to use lib{64,32,x32} paths
Issue: #25157
2023-09-20 12:44:00 -04:00
Brad King
e625255fe4 Help: Indent find_package REGISTRY_VIEW paragraphs together
In commit 8d7e80cf3d (find_* commands: add control over Windows registry
views, 2022-04-16, v3.24.0-rc1~201^2) this indentation was used for the
other find commands but was left out for `find_package`.
2023-09-20 12:31:27 -04:00
Brad King
092353eb86 Merge branch 'release-3.27' 2023-09-20 11:07:49 -04:00
Brad King
51b34a5483 CMake 3.27.6 v3.27.6 2023-09-20 10:33:04 -04:00
Martin Duffy
ec2ba29ac5 Ninja: Allow compilation before generation of dependencies' private sources
This requires knowing when a generated header is public, which we can
model using file sets.  Add policy CMP0154 to treat generated sources
as private by default in targets with file sets.  Generated public
headers can be specified in public file sets.

Fixes: #24959
Issue: #15555
2023-09-20 10:25:24 -04:00
Brad King
78aa3f165a Merge branch 'release-3.27' 2023-09-20 10:16:18 -04:00
Brad King
787dde5569 Merge topic 'fortran-in-custom-targets'
d870a47e23 Tests/FortranModules: add a test for iface Fortran sources
e3d511fb9c Tests/FortranModules: also test INTERFACE targets with Fortran sources
978b68d3bb add_custom_target: Fix regression with Fortran sources
619aca80ae Tests/FortranModules: add a test case for #25223
45513c1a69 Tests/FortranModules: move issue 25112 fix from FortranOnly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8814
2023-09-20 10:16:18 -04:00
Brad King
ea3e9ba054 Merge topic 'fortran-in-custom-targets' into release-3.27
d870a47e23 Tests/FortranModules: add a test for iface Fortran sources
e3d511fb9c Tests/FortranModules: also test INTERFACE targets with Fortran sources
978b68d3bb add_custom_target: Fix regression with Fortran sources
619aca80ae Tests/FortranModules: add a test case for #25223
45513c1a69 Tests/FortranModules: move issue 25112 fix from FortranOnly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8814
2023-09-20 10:16:17 -04:00
Brad King
7b1e930b0f Merge topic 'remove-redundant-stat'
d49ea4a4d9 Source: Remove redundant FileIsDirectory checks
f5ff17fcf2 Source: Remove redundant FileIsSymlink checks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8810
2023-09-20 09:48:36 -04:00
Brad King
3a21087282 Merge topic 'cache-ldconfigpaths'
f173ca21ca cmBinUtilsLinuxELFLinker: Cache ldconfig results

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8811
2023-09-20 09:46:38 -04:00
Brad King
59f6892ab7 Merge topic 'FindPkgConfig-override'
e0d00b9218 FindPkgConfig: Allow to override variables when calling pkg_get_variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8808
2023-09-20 09:25:56 -04:00
Ben Boeckel
d870a47e23 Tests/FortranModules: add a test for iface Fortran sources
This tests that a library that doesn't compile Fortran sources but
provides one via `INTERFACE` sources works as intended.
2023-09-20 09:18:01 -04:00
Ben Boeckel
e3d511fb9c Tests/FortranModules: also test INTERFACE targets with Fortran sources 2023-09-20 09:16:59 -04:00
Ben Boeckel
978b68d3bb add_custom_target: Fix regression with Fortran sources
Since commit 74b1d6caf3 (cmComputeLinkInformation: compute link info for
module-using targets, 2023-09-05, v3.27.5~7^2) we accidentally try to
compute link information for custom targets if they have Fortran
sources.  For module dependencies, we only need to consider target types
that can compile.

Fixes: #25252
2023-09-20 09:14:58 -04:00
Kitware Robot
de7c036304 CMake Nightly Date Stamp 2023-09-20 00:01:12 -04:00
Brad King
4c92fc709a ci: Update LLVM/Clang to 17.0 in nightly CI jobs on Windows 2023-09-19 15:26:07 -04:00
Atılhan Emre Dursunoğlu
f173ca21ca cmBinUtilsLinuxELFLinker: Cache ldconfig results
Running GetLDConfigPaths in every ScanDependencies is expensive.
2023-09-19 17:38:25 +03:00
Brad King
9e641b73c1 Merge topic 'test-ExportImport'
be5603d031 Tests: Fix ExportImport test with read-only source tree

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8813
2023-09-19 09:10:44 -04:00
Brad King
3d3c49cd9c Merge topic 'update-module-document'
3a54ee8cd5 FindQuickTime: Improve documentation formatting
3cf5f4af54 FindProducer: Improve documentation formatting
b35c17b202 FindPhysFS: Improve documentation formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8812
2023-09-19 09:09:44 -04:00
Brad King
7a88ff9487 Merge topic 'FindMatlab-version-full'
39881de3f6 FindMatlab:macOS: return full version when found by path guess
35bcb9116c FindMatlab:lint: set(... CACHE INTERNAL) implies FORCE
dc9d9589e4 FindMatlab:WIN32: return full Matlab version when found via registry
abbfdd3b3a FindMatlab: improve version regex
ff20d993f3 FindMatlab: doc: rename osx=>macOS
d7b73f14c2 FindMatlab: retrieve full major.minor.patch.tweak
8b8135487f FindMatlab: refactor: remove unneeded syntax
fff5c1507e FindMatlab: refactor: use registry query instead of execute_process

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8805
2023-09-19 09:06:52 -04:00
Brad King
26578aadc4 Merge topic 'script_file_exists'
ca77b745e9 cmake: Clarify error if -P script does not exist

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8809
2023-09-19 09:05:45 -04:00
Corentin Noël
e0d00b9218 FindPkgConfig: Allow to override variables when calling pkg_get_variable
This is specifically useful when building applications within containers as we
sometimes need to redefine the prefix used in a variable.
2023-09-19 09:08:48 +02:00
Kitware Robot
62df021464 CMake Nightly Date Stamp 2023-09-19 00:01:12 -04:00
scivision
d49ea4a4d9 Source: Remove redundant FileIsDirectory checks 2023-09-18 23:11:28 -04:00
Ben Boeckel
619aca80ae Tests/FortranModules: add a test case for #25223 2023-09-18 19:58:49 -04:00
Ben Boeckel
45513c1a69 Tests/FortranModules: move issue 25112 fix from FortranOnly
It involves modules, so it belongs in the `FortranModules` test set.
2023-09-18 19:41:47 -04:00
Brad King
be5603d031 Tests: Fix ExportImport test with read-only source tree 2023-09-18 18:11:32 -04:00
scivision
f5ff17fcf2 Source: Remove redundant FileIsSymlink checks
Replace `FileExists || FileIsSymlink` with `PathExists`.
The latter does not resolve symlinks, so this is OK for use
with broken symlinks, files, and directories.
2023-09-18 16:35:10 -04:00
scivision
39881de3f6 FindMatlab:macOS: return full version when found by path guess 2023-09-18 15:50:48 -04:00
scivision
35bcb9116c FindMatlab:lint: set(... CACHE INTERNAL) implies FORCE 2023-09-18 15:23:21 -04:00
scivision
dc9d9589e4 FindMatlab:WIN32: return full Matlab version when found via registry
rework internal XML reading function for better code reuse and
namespace isolation
2023-09-18 15:23:21 -04:00
scivision
abbfdd3b3a FindMatlab: improve version regex
the matlab_versions_mapping always has at least major.minor
2023-09-18 15:23:21 -04:00
scivision
ff20d993f3 FindMatlab: doc: rename osx=>macOS 2023-09-18 15:09:51 -04:00
scivision
d7b73f14c2 FindMatlab: retrieve full major.minor.patch.tweak 2023-09-18 15:09:49 -04:00
scivision
8b8135487f FindMatlab: refactor: remove unneeded syntax 2023-09-18 15:07:53 -04:00
scivision
fff5c1507e FindMatlab: refactor: use registry query instead of execute_process
On Windows,
instead of executing "reg query" it's much simpler and more robust
to use cmake's built in registry query.

Remove unused variables. Significantly reduces amount of code in
function.
2023-09-18 15:07:52 -04:00
scivision
ca77b745e9 cmake: Clarify error if -P script does not exist 2023-09-18 11:51:31 -04:00