mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 07:08:38 -05:00
Code Issues Packages Projects Releases Wiki Activity
58,945 Commits 2 Branches 401 Tags
08930f76ef56c9149a9c5046898a7b56772b8621
Commit Graph

58945 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 08930f76ef Merge topic 'fetchcontent-extra' 
629d106c5e Help: Fix typo in FetchContent example, extras should read extra

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: hinell <al.neodim@gmail.com>
Merge-request: !7657
 2022-09-09 09:53:41 -04:00
Brad King 716d89b8ab Merge branch 'release-3.24' 2022-09-09 09:52:06 -04:00
Brad King 29c0633793 Merge topic 'truncation_invalid' 
bd30d20bc3 Tests: Add cases covering bad ctest output truncation types
dbf840392d ctest: print error for invalid CTEST_CUSTOM_TEST_OUTPUT_TRUNCATION

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7596
 2022-09-09 09:52:06 -04:00
Brad King 6695957237 Merge topic 'truncation_invalid' into release-3.24 
bd30d20bc3 Tests: Add cases covering bad ctest output truncation types
dbf840392d ctest: print error for invalid CTEST_CUSTOM_TEST_OUTPUT_TRUNCATION

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7596
 2022-09-09 09:52:04 -04:00
Brad King 13fe11fb18 Merge branch 'release-3.24' 2022-09-09 09:50:05 -04:00
Brad King 39d2ceb4f1 Merge topic 'revert-automoc-silence-warnings' 
e08d34eda1 automoc: revert attempts to silence linker warning on macos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7652
 2022-09-09 09:50:05 -04:00
Brad King 11754888a8 Merge topic 'revert-automoc-silence-warnings' into release-3.24 
e08d34eda1 automoc: revert attempts to silence linker warning on macos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7652
 2022-09-09 09:50:04 -04:00
Brad King 45b7628a02 Merge branch 'release-3.24' 2022-09-09 09:48:56 -04:00
Brad King 06404a1979 Merge topic 'check-library-properties-fix-performances-regression' 
985b4c82a6 Check link libraries properties: fix performances regression
a47eef32a3 renames method FinalizeTargetCompileInfo() in FinalizeTargetConfiguration().

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7651
 2022-09-09 09:48:56 -04:00
Brad King dac4f26918 Merge topic 'check-library-properties-fix-performances-regression' into release-3.24 
985b4c82a6 Check link libraries properties: fix performances regression
a47eef32a3 renames method FinalizeTargetCompileInfo() in FinalizeTargetConfiguration().

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7651
 2022-09-09 09:48:55 -04:00
Mathieu Malaterre 629d106c5e Help: Fix typo in FetchContent example, extras should read extra 
Amends 29e31e2825 (Packages: Integrate FetchContent and
find_package(), 2022-04-28)
 2022-09-09 20:08:32 +10:00
Kitware Robot 347fa6169f CMake Nightly Date Stamp 2022-09-09 00:01:16 -04:00
Kitware Robot 83686df1d6 CMake Nightly Date Stamp 2022-09-08 00:01:34 -04:00
Brad King bd30d20bc3 Tests: Add cases covering bad ctest output truncation types 
Issue: #23869
 2022-09-07 12:23:08 -04:00
Frank Winklmeier dbf840392d ctest: print error for invalid CTEST_CUSTOM_TEST_OUTPUT_TRUNCATION 
Print an error message for invalid values of
`CTEST_CUSTOM_TEST_OUTPUT_TRUNCATION` in a ctest dashboard script.
The option was added by commit 140704d443 (ctest: add option for
output truncation, 2022-03-07, v3.24.0-rc1~513^2).

Fixes: #23869
 2022-09-07 11:52:03 -04:00
Brad King ecfc63a9b0 Merge topic 'try_compile-unique-bindir' 
aa9220d3a0 try_compile: Add keyword-dispatched signature
d1befe5515 cmSystemTools: Add MakeTempDirectory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Matthew Woehlke <matthew.woehlke@kitware.com>
Merge-request: !7579
 2022-09-07 10:43:14 -04:00
Brad King e08d34eda1 automoc: revert attempts to silence linker warning on macos 
We've made several attempts to add a dummy symbol to `mocs_compilation.cpp`
when there are no automoc sources:

* commit 4a9daae483 (automoc: silence linker warning on macos,
                     2022-05-25, v3.24.0-rc1~55^2)
* commit 844244ccdc (automoc: avoid compiler warnings in linker-warning-
                     silencing code, 2022-08-10, v3.24.1~6^2)
* commit fc8628389f (automoc: avoid more compiler warnings in linker-
                     warning-silencing code, 2022-08-29)

The last attempt derives a symbol name from the path to the source
file, but that breaks reproducible builds because it is not stable
w.r.t. the location of the build tree.  Revert all these attempts
for the 3.24 release series, and return to what 3.23 and below did.
Further investigation will be needed to resolve the original issue.

Fixes: #23937
Issue: #23551, #23823, #23823
 2022-09-07 10:35:17 -04:00
Brad King a64aa9bd30 Merge topic 'return-propagate-variables' 
838a5fae23 return(): Propagate variables to result scope
8f0e1f2111 cmMakefile: add RaiseScope for list of variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !7634
 2022-09-07 09:51:51 -04:00
Brad King 15f3d6e87a Merge topic 'nasinlock/enable_two_part_vs_toolset_versions' 
f972e4fd3a cmVSGenerator: Add support for two-part toolset versions for Visual Studio

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7637
 2022-09-07 09:50:01 -04:00
Brad King c3dafa24b2 Merge topic 'cpack-reuse-cmake-tools' 
0c638ab597 CPack: re-use paths of tools discovered by CMakeFindBinUtils

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7635
 2022-09-07 09:49:12 -04:00
Brad King dae13c214f Merge topic 'cuda_support_sm90a' 
234aa7e0aa CUDA: Support upcoming sm90a architecture

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7649
 2022-09-07 09:48:25 -04:00
Brad King 12124a1b41 Merge topic 'tutorial_postfix_for_executables' 
3241e3ef03 Tutorial: Align step 12 prose with documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7645
 2022-09-07 09:47:26 -04:00
Brad King 4395fee8a9 Merge topic 'test-find-boost' 
047c98f4a0 FindPackageTest: Replace VTK with Boost

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7638
 2022-09-07 09:46:24 -04:00
Brad King 8371fb84c0 Merge topic 'functiontests-haz-fails' 
4cae5b8f5c FunctionTest: Fix some test failure checks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7640
 2022-09-07 09:45:20 -04:00
Brad King 69947f4984 Merge topic 'cpack-archive-custom-extension' 
cc3cd8bc2a CPack: allow custom file extension in archive generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7563
 2022-09-07 09:44:16 -04:00
Brad King 0dc1e0a20c Merge branch 'release-3.24' 2022-09-07 09:42:12 -04:00
Brad King 8fe6d06c2c Merge topic 'zlib-windows-cross-compile-fix' 
67b6f1a09b FindZLIB: fix CMAKE_FIND_LIBRARY_PREFIXES being unset when it was empty

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7647
 2022-09-07 09:42:12 -04:00
Brad King 9a916eaae3 Merge topic 'zlib-windows-cross-compile-fix' into release-3.24 
67b6f1a09b FindZLIB: fix CMAKE_FIND_LIBRARY_PREFIXES being unset when it was empty

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7647
 2022-09-07 09:42:11 -04:00
Brad King 64ac12ec80 Merge branch 'release-3.24' 2022-09-07 09:40:42 -04:00
Brad King 9e2edc54d5 Merge branch 'release-3.23' 2022-09-07 09:40:40 -04:00
Brad King 79e37d3d61 Merge branch 'release-3.23' into release-3.24 2022-09-07 09:40:34 -04:00
Brad King fadb8c8ea8 Merge branch 'release-3.24' 2022-09-07 09:38:01 -04:00
Brad King f6813c4159 Merge topic 'findCUDAToolkit_declare_deps_for_targets_once' 
f0918fe505 FindCUDAToolkit: Correctly state cusolver and cublas dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7633
 2022-09-07 09:38:01 -04:00
Brad King 6a2fd8439a Merge topic 'findCUDAToolkit_declare_deps_for_targets_once' into release-3.24 
f0918fe505 FindCUDAToolkit: Correctly state cusolver and cublas dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7633
 2022-09-07 09:38:00 -04:00
Marc Chevrier 985b4c82a6 Check link libraries properties: fix performances regression 
Fixes: #23939
 2022-09-07 15:20:53 +02:00
Marc Chevrier a47eef32a3 renames method FinalizeTargetCompileInfo() in FinalizeTargetConfiguration(). 2022-09-07 14:23:21 +02:00
Kitware Robot 6b8233cac8 CMake Nightly Date Stamp 2022-09-07 00:01:20 -04:00
Robert Maynard 234aa7e0aa CUDA: Support upcoming sm90a architecture 
The architecture values are being extended to have at time
a trailing `a`. This updates the CMake regex to support
this syntax.
 2022-09-06 11:09:46 -04:00
Daniel Scharrer 67b6f1a09b FindZLIB: fix CMAKE_FIND_LIBRARY_PREFIXES being unset when it was empty 
CMAKE_FIND_LIBRARY_PREFIXES and CMAKE_FIND_LIBRARY_SUFFIXES have
different behavior when undefined and when defined but empty:
Empty means to use an empty prefix/suffix while undefined means to
use a hardcoded default for the platform we are running on.

Unfortunately, set(a ${b}) will undefine a when b is empty,
meaning that when targeting a platform where either of these variables
is empty (e.g. Windows where CMAKE_FIND_LIBRARY_PREFIXES is empty)
the unpatched FindZLIB code ends up unsetting that variable, causing
all subsequent find_library calls to use the hardcoded default
for the runtime platform (e.g. "lib" for CMAKE_FIND_LIBRARY_PREFIXES
on Linux).

On the other hand, set(a "${b}") will always define a to be empty but
defined so we have to do this dance to fully preserve the state of these
variables.
 2022-09-06 11:05:23 -04:00
Matteo Martelli 0c638ab597 CPack: re-use paths of tools discovered by CMakeFindBinUtils 
`CMakeFindBinUtils.cmake` sets `CMAKE_<TOOL>` variables that in
cross-compilation environments point to the toolchain specific
executables: e.g. `CMAKE_OBJCOPY` might point to
`<path_to_toolchain>/arm-poky-linux-gnueabi-objcopy`.
Pass this information to CPack.
 2022-09-06 09:49:54 -04:00
Brad King 5d80d7cb6a Merge branch 'findCUDAToolkit_declare_deps_for_targets_once' into release-3.23 
Merge-request: !7633
 2022-09-06 09:14:57 -04:00
Brad King 138337f53c Merge topic 'implicit-link-info-msvc' 
93f2cd5b7c CMakeParseImplicitLinkInfo: Better detection of msvc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7619
 2022-09-06 09:02:05 -04:00
Craig Scott 37cfd26741 Merge branch 'release-3.24' 2022-09-06 08:35:56 -04:00
Craig Scott df05616085 Merge topic 'truncation_test' 
cb55d5e730 RunCMakeTest: fix Truncation test definition

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7632
 2022-09-06 08:35:56 -04:00
Craig Scott aa4da6944e Merge topic 'truncation_test' into release-3.24 
cb55d5e730 RunCMakeTest: fix Truncation test definition

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7632
 2022-09-06 08:35:55 -04:00
Craig Scott 4758d4e868 Merge branch 'release-3.24' 2022-09-06 08:33:01 -04:00
Craig Scott bda263cda6 Merge topic 'help-windows-registry' 
5b30ca2436 Help: cmake-developer: Add section for Windows registry access.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7642
 2022-09-06 08:33:01 -04:00
Craig Scott b3f106b330 Merge topic 'help-windows-registry' into release-3.24 
5b30ca2436 Help: cmake-developer: Add section for Windows registry access.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7642
 2022-09-06 08:33:00 -04:00
Kitware Robot 52822ac466 CMake Nightly Date Stamp 2022-09-06 00:01:13 -04:00
Matthew Woehlke aa9220d3a0 try_compile: Add keyword-dispatched signature 
Introduce a new signature for try_compile (and try_run) which removes
the `bindir` argument and requires the SOURCES tag. This will eventually
allow us to add other ways of providing sources, but also allows us to
change the behavior without breaking compatibility.

The old signature uses a special, but non-unique temporary location
inside the specified `bindir`, which conventionally is just the
project's build directory. The new signature unconditionally uses the a
unique temporary directory which is unconditionally within the project's
build directory (which is no longer separately specified). This ensures
that successive runs do not overwrite previous runs, will simplify
debugging, and should also, eventually, allow us to execute multiple
trials in parallel.
 2022-09-05 13:19:59 -04:00