Commit Graph

57383 Commits

Author SHA1 Message Date
Kitware Robot cf6235719b CMake Nightly Date Stamp 2022-05-09 00:01:15 -04:00
Kitware Robot b541073a44 CMake Nightly Date Stamp 2022-05-08 00:01:04 -04:00
Kitware Robot ddfa4372f7 CMake Nightly Date Stamp 2022-05-07 00:01:12 -04:00
Kyle Edwards 7dc5824960 Merge topic 'json-pass-state'
7b7fc2df0b cmJSONHelpers: Allow passing state context
30336dab66 cmJSONHelpers: Restructure cmJSONHelpers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7231
2022-05-06 12:30:44 -04:00
Brad King 849ad97d95 Merge topic 'truncation_relnotes'
99cad40172 Help: Document version of ctest(1) adding output truncation mode
a6f2c13727 Help: Add release notes for test-output-truncation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7242
2022-05-06 09:00:26 -04:00
Brad King e36599f8b0 Merge topic 'try_compile-platform-vars'
40f380fcb0 cmCoreTryCompile: Replace vector push_back with emplace_back
c6b0657f5b cmCoreTryCompile: Move platform variable forwarding to dedicated block

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7243
2022-05-06 08:59:00 -04:00
Brad King 6c8aa39a6c Merge branch 'release-3.23' 2022-05-06 08:57:25 -04:00
Brad King 78b7046a32 Merge topic 'Java-version-handling'
c80763c701 Merge branch 'backport-3.23-Java-version-handling' into Java-version-handling
93e18a4eb6 FindJava, FindJNI: ensure correct handling of versions on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7241
2022-05-06 08:57:25 -04:00
Brad King cc207014cf Merge topic 'Java-version-handling' into release-3.23
93e18a4eb6 FindJava, FindJNI: ensure correct handling of versions on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7241
2022-05-06 08:57:24 -04:00
Craig Scott c5dff5ace2 Merge topic 'FetchContent_find_package_integration'
29e31e2825 Packages: Integrate FetchContent and find_package()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: huangqinjin <huangqinjin@gmail.com>
Merge-request: !5688
2022-05-06 08:33:38 -04:00
Kitware Robot 30f9159667 CMake Nightly Date Stamp 2022-05-06 00:01:08 -04:00
Brad King 8a40680524 Merge topic 'HelpExit'
0aea13d20b Help: for message(FATAL_ERROR), document nonzero exit code
cc97725137 Help: document exit code of command cmake(1)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7175
2022-05-05 12:51:47 -04:00
Brad King 213f391715 Merge topic 'HelpEnv'
a693da21f3 Help: from command:if, link to environment variables
ab2bdbaf31 Help: Cross-reference ENV operator from cmake-language(7) manual
ee4e728a69 Help: From Environment Variables section, link to cmake -E env etc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7239
2022-05-05 12:50:53 -04:00
Brad King 99cad40172 Help: Document version of ctest(1) adding output truncation mode
While at it, fix mode value markup.

Issue: #23206
2022-05-05 12:42:59 -04:00
Martin Duffy 7b7fc2df0b cmJSONHelpers: Allow passing state context
Allow for passing of context to JSON Helper methods in cmJSONHelpers.
2022-05-05 12:12:53 -04:00
Martin Duffy 30336dab66 cmJSONHelpers: Restructure cmJSONHelpers
Restructure cmJSONHelpers to prevent SunPro errors when passing context.
2022-05-05 12:12:12 -04:00
Frank Winklmeier a6f2c13727 Help: Add release notes for test-output-truncation
Add missing release notes for test-output-truncation.

Issue: #23206
2022-05-05 17:50:29 +02:00
Brad King 40f380fcb0 cmCoreTryCompile: Replace vector push_back with emplace_back 2022-05-05 11:23:40 -04:00
Brad King c6b0657f5b cmCoreTryCompile: Move platform variable forwarding to dedicated block
Prepare to enable the behavior under more conditions.

Issue: #23219
2022-05-05 11:23:12 -04:00
Joachim Wuttke (h) 0aea13d20b Help: for message(FATAL_ERROR), document nonzero exit code 2022-05-05 09:43:39 -04:00
Joachim Wuttke (h) a693da21f3 Help: from command:if, link to environment variables 2022-05-05 09:37:20 -04:00
Joachim Wuttke (h) ab2bdbaf31 Help: Cross-reference ENV operator from cmake-language(7) manual 2022-05-05 09:36:23 -04:00
Joachim Wuttke (h) ee4e728a69 Help: From Environment Variables section, link to cmake -E env etc 2022-05-05 09:35:57 -04:00
Brad King 7d78dcbebb Merge topic 'cpack-wix-arch'
cae7e5e38d CPack/WIX: Add CPACK_WIX_ARCHITECTURE to support Windows for ARM installers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7236
2022-05-05 09:31:46 -04:00
Brad King cd20592c6d Merge topic 'ExternalProject-no-extract-timestamp'
a283e58b51 ExternalProject: Add DOWNLOAD_EXTRACT_TIMESTAMP option and policy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7137
2022-05-05 09:20:41 -04:00
Brad King f533b548ca Merge topic 'remove-PackageMaker-generator'
c150f89f4d CPack: Remove the deprecated PackageMaker generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7221
2022-05-05 09:17:35 -04:00
jakoblover cae7e5e38d CPack/WIX: Add CPACK_WIX_ARCHITECTURE to support Windows for ARM installers 2022-05-05 09:11:57 -04:00
Brad King 284a3d7ae5 Merge topic 'better_error_message_when_lang_not_enabled'
627ef4c1d0 Provide guidance when trying to use non-enabled language

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7213
2022-05-05 09:07:01 -04:00
Marc Chevrier c80763c701 Merge branch 'backport-3.23-Java-version-handling' into Java-version-handling 2022-05-05 11:18:55 +02:00
Marc Chevrier 93e18a4eb6 FindJava, FindJNI: ensure correct handling of versions on Windows
* versions are sorted in correct order
* EXACT keyword is taken into account

Fixes: #23479
2022-05-05 11:14:52 +02:00
Kitware Robot d80c426683 CMake Nightly Date Stamp 2022-05-05 00:01:06 -04:00
Kasper Laudrup a283e58b51 ExternalProject: Add DOWNLOAD_EXTRACT_TIMESTAMP option and policy
Add the option to keep the current filestamps when extracting an
archive in ExternalProject_Add.

Enabling this option makes the behavior consistent with how
ExternalProject_Add is used when checking out code from revision
control instead of an archive.

Fixes: #22746
2022-05-05 09:01:54 +10:00
Craig Scott c150f89f4d CPack: Remove the deprecated PackageMaker generator
This CPack generator has been deprecated since commit 7bf187499f
(CPack: Deprecate PackageMaker generator, 2020-01-31).

Fixes: #23344
2022-05-05 08:36:44 +10:00
Brad King 2045e1eee0 Merge topic 'less_ptx_for_all_all-major_native'
e8591f1516 CUDA: native/all/all-major generates minimal set of ptx code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !7216
2022-05-04 11:18:28 -04:00
Brad King 16e0ccd70f Merge topic 'cuda-vs-use-LinkLineDeviceComputer'
149c952007 CUDA: Use cmLinkLineDeviceComputer in VS generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7235
2022-05-04 11:13:24 -04:00
Brad King 1784440bd0 Merge topic 'cpack-nsis-typos'
125f6964ba CPack/NSIS: Fix several typos in the NSIS template

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7227
2022-05-04 11:11:09 -04:00
Brad King bdaa4b8459 Merge topic 'chsi-windows_registry-updates'
0c33f12a39 cmake_host_system_information(WINDOWS_REGISTRY) updates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7229
2022-05-04 11:10:12 -04:00
Brad King 8aff3e41a8 Merge topic 'FindThreads-aix'
3257c34073 FindThreads: avoid failing in AIX when using -D_XOPEN_SOURCE=500

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7230
2022-05-04 11:08:38 -04:00
Brad King 9a49a93d98 Merge branch 'release-3.23' 2022-05-04 11:07:11 -04:00
Brad King d47e466935 Merge topic 'FindPython-fix-typo-error'
fff8d5b212 FindPython: fix typo error

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7233
2022-05-04 11:07:10 -04:00
Brad King 6ce2e0b5f9 Merge topic 'FindPython-fix-typo-error' into release-3.23
fff8d5b212 FindPython: fix typo error

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7233
2022-05-04 11:07:09 -04:00
Robert Maynard 627ef4c1d0 Provide guidance when trying to use non-enabled language
Fixes #23463
2022-05-04 09:33:35 -04:00
Joachim Wuttke (h) cc97725137 Help: document exit code of command cmake(1) 2022-05-04 14:17:01 +02:00
Kitware Robot 3d1d7d2b38 CMake Nightly Date Stamp 2022-05-04 00:01:09 -04:00
Sadie Powell 125f6964ba CPack/NSIS: Fix several typos in the NSIS template 2022-05-03 12:47:27 -04:00
Robert Maynard 149c952007 CUDA: Use cmLinkLineDeviceComputer in VS generator
Resolve a fixme comment in `ComputeCudaLinkOptions`.
2022-05-03 12:37:59 -04:00
Carlo Marcelo Arenas Belón 3257c34073 FindThreads: avoid failing in AIX when using -D_XOPEN_SOURCE=500
Current FindThreads fails in AIX (tested on 7.1 and 7.2) when using
additional compilation flags (ex: -D_XOPEN_SOURCE=500) because the
linker might need additional flags to link and those aren't yet known
by the time check_include("pthread.h") is run (which is also the first
test).

Remove the check for it and all supporting code and rely instead on
the compilation test that will be done later to find the correct
syntax to use, and that confirms it exists implicitly.
2022-05-03 12:26:18 -04:00
Robert Maynard e8591f1516 CUDA: native/all/all-major generates minimal set of ptx code
Fixes #23459
2022-05-03 11:52:23 -04:00
Brad King e0dbca93aa Merge topic 'find_item-query-windows-registry'
8d7e80cf3d find_* commands: add control over Windows registry views
08941a9a40 cmWindowsRegistry: Add helper for conversion between string and enum View
769f25aa3c cmWindowsRegistry: enhance unicode conversions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7211
2022-05-03 11:31:04 -04:00
Brad King 252fdfe6e4 Merge topic 'cuda-arch-verify'
7bf5200699 CUDA: Restore CMAKE_CUDA_ARCHITECTURES support for -real and -virtual suffixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewd-by: Raul Tambre <raul@tambre.ee>
Merge-request: !7218
2022-05-03 11:26:40 -04:00