Commit Graph

59371 Commits

Author SHA1 Message Date
Brad King
6fa189f716 Merge topic 'cmake-presets-output-junit' into release-3.25
bea4ed5430 CTest: Add support for outputJUnitFile in presets
9270a02003 CMakePresets.json: Add outputJUnitFile to test presets schema
757786bb73 Tests: Add test for outputLogFile in CMakePresets.json
b68c3596e7 CMakePresets.json: Disallow extra properties in test output schema

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !7806
2022-10-19 10:04:29 -04:00
Brad King
86ed35cf63 Merge topic 'mingw-unc' into release-3.25
9777e4c30e MinGW Makefiles: Quote UNC paths on command lines

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7802
2022-10-19 09:59:59 -04:00
Brad King
9ece08666d Merge branch 'release-3.24' into release-3.25 2022-10-19 09:58:14 -04:00
Brad King
589aa44952 Merge branch 'release-3.23' into release-3.24 2022-10-19 09:58:01 -04:00
Brad King
177c56e3fa Merge topic 'try_compile-CMP0128' into release-3.25
50e90e2828 try_compile: Honor CMP0128 setting in test project

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !7803
2022-10-19 09:57:08 -04:00
Brad King
077e42fe76 Merge topic 'android-path-suffixes' into release-3.25
7e5b48a7b1 Android: Avoid searching API level directories matching architecture bitness

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7805
2022-10-19 09:55:59 -04:00
Kyle Edwards
bea4ed5430 CTest: Add support for outputJUnitFile in presets
Fixes: #22400
2022-10-18 16:52:23 -04:00
Kyle Edwards
9270a02003 CMakePresets.json: Add outputJUnitFile to test presets schema 2022-10-18 15:41:29 -04:00
Brad King
20587e5af9 Merge topic 'doc-flag-init' into release-3.25
e0075799ed Help: Clarify how language-specific flag environment values are used

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7804
2022-10-18 15:32:26 -04:00
Kyle Edwards
757786bb73 Tests: Add test for outputLogFile in CMakePresets.json 2022-10-18 15:20:44 -04:00
Kyle Edwards
b68c3596e7 CMakePresets.json: Disallow extra properties in test output schema
And add test for testOutputTruncation being unsupported.
2022-10-18 14:40:11 -04:00
Ed Hartley
9777e4c30e MinGW Makefiles: Quote UNC paths on command lines
UNC paths (starting with `\\`) need quotes when generating MinGW
Makefiles to avoid gmake interpreting the first `\` as an escape
character.

Fixes: #24061
2022-10-18 14:30:57 -04:00
Brad King
588c9c4145 Merge branch 'try_compile-CMP0128' into release-3.24
Merge-request: !7803
2022-10-18 14:25:52 -04:00
Brad King
96172ba2d1 Merge branch 'try_compile-CMP0128' into release-3.23
Merge-request: !7803
2022-10-18 14:25:26 -04:00
Brad King
263d733a58 Merge branch 'android-path-suffixes' into release-3.24
Merge-request: !7805
2022-10-18 14:22:17 -04:00
Sergiu Deitsch
7e5b48a7b1 Android: Avoid searching API level directories matching architecture bitness
When cross-compiling for Android, the library path suffixes `/<number>/`
refer to API level specific platform libraries instead of architecture
bitness. Disable path suffix use under NDK to avoid incorrect inclusion
of API level specific libraries below the targeted API level.

Fixes: #23830
2022-10-18 14:21:51 -04:00
Brad King
e0075799ed Help: Clarify how language-specific flag environment values are used
Previous the wording could be interpreted to mean that the environment
variables like `CXXFLAGS` are used exclusively to initialize the
corresponding cache entries like `CMAKE_CXX_FLAGS`.  State clearly
that the value will be used in combination with builtin defaults.

Issue: #23956
2022-10-18 14:10:41 -04:00
Brad King
53841c6ea2 Merge branch 'release-3.24' into release-3.25 2022-10-18 13:52:04 -04:00
Brad King
dd32e58cae Merge topic 'FindJNI-android-api' into release-3.25
c833df0924 FindJNI: replace CMAKE_ANDROID_API by CMAKE_SYSTEM_VERSION

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7801
2022-10-18 13:51:01 -04:00
Brad King
65542be970 Merge topic 'doc-CMAKE_ANDROID_API' into release-3.25
a739b55bb6 Help: Clarify historical-only role of CMAKE_ANDROID_API variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7800
2022-10-18 13:49:52 -04:00
Brad King
5b2900a195 Merge topic 'tutorial-step1-standard-required' into release-3.25
5b7e465be3 Tutorial: Fix variable name typo in step 1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7799
2022-10-18 13:48:38 -04:00
Brad King
f688e4ff9f Merge topic 'serenityos-no-libdl' into release-3.25
4fa0d157bc SerenityOS: Unset CMAKE_DL_LIBS because LibDl no longer exists

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7797
2022-10-18 13:47:07 -04:00
Brad King
599e49cf9b Merge topic 'revert_nvcc_marking_include_as_system' into release-3.25
d0e52219eb CUDA: Revert "Always mark cuda toolkit as system include"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7798
2022-10-18 13:45:56 -04:00
Brad King
50e90e2828 try_compile: Honor CMP0128 setting in test project
Some projects pass a raw `-std=` flag to the compiler in the
`try_compile` project.  If they do not set CMP0128 to NEW,
we should not append a `-std=` flag where we did not before
the policy was added.

Fixes: #24063
2022-10-18 13:38:00 -04:00
Brad King
9fefa9ef49 Merge branch 'FindJNI-android-api' into release-3.24
Merge-request: !7801
2022-10-17 15:53:41 -04:00
Sergiu Deitsch
c833df0924 FindJNI: replace CMAKE_ANDROID_API by CMAKE_SYSTEM_VERSION
In commit 00c4f488f2 (FindJNI: support Android NDK, 2022-03-18,
v3.24.0-rc1~325^2) we used `CMAKE_ANDROID_API` to check the Android API
level.  However, `CMAKE_SYSTEM_VERSION` is the authoritative value.

When cross-compiling for Android, an unset `CMAKE_ANDROID_API` can
result in failure to locate JNI because the `NativeHelper` component
cannot be found. In this case, the component is falsely assumed to be
available by default (and thus required) since the comparison against an
unset `CMAKE_ANDROID_API` variable evaluates to true.  Use
`CMAKE_SYSTEM_VERSION` to determine the Android API level instead.

Issue: #23830
2022-10-17 15:51:10 -04:00
Brad King
a739b55bb6 Help: Clarify historical-only role of CMAKE_ANDROID_API variable
Revise documentation added by commit 6b84df8da9 (Help: Document cross
compiling for Android, 2016-06-20, v3.7.0-rc1~229^2~2) to avoid implying
that `CMAKE_ANDROID_API` is interchangeable with `CMAKE_SYSTEM_VERSION`.
The latter is the authoritative value of the Android API level.

Issue: #23830
2022-10-17 11:42:46 -04:00
Steven
5b7e465be3 Tutorial: Fix variable name typo in step 1
`CMAKE_CXX_REQUIRED_STANDARD` => `CMAKE_CXX_STANDARD_REQUIRED`
2022-10-17 10:36:15 -04:00
Robert Maynard
d0e52219eb CUDA: Revert "Always mark cuda toolkit as system include"
We need to revert this change as it can disable error messages
when compiling invalid CUDA code.

This reverts commit ea659b155d (CUDA: Always mark cuda toolkit as system
include, 2022-06-27, v3.25.0-rc1~269^2).
2022-10-17 10:17:33 -04:00
Andrew Kaster
4fa0d157bc SerenityOS: Unset CMAKE_DL_LIBS because LibDl no longer exists
Serenity's LibDl was merged into LibC to simplify the build and port
infrastructure [1].  Set `CMAKE_DL_LIBS` to the empty string to match
what other platforms do.  Update the platform module added by
commit 45ca894164 (SerenityOS: Add Platform module, 2022-01-02,
v3.25.0-rc1~635^2).

[1] https://github.com/SerenityOS/serenity/pull/14854

Issue: #23589
2022-10-17 10:13:47 -04:00
Brad King
787fc8caa8 Merge topic 'xcode-framework-consumption' into release-3.25
4aa86da827 Xcode: ensure framework with custom output directory can be consumed

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jason Juang <jasjuang@gmail.com>
Merge-request: !7791
2022-10-17 10:03:57 -04:00
Brad King
f8ac57228f Merge branch 'release-3.24' into release-3.25 2022-10-17 10:02:00 -04:00
Brad King
06294a1945 Merge branch 'release-3.23' into release-3.24 2022-10-17 10:01:52 -04:00
Brad King
4cb8564087 Merge topic 'doc-timestamp-f' into release-3.25
7d25ae7350 Help: Add versionadded for string(TIMESTAMP) %f specifier

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7796
2022-10-17 10:00:57 -04:00
Brad King
7780588d82 Merge branch 'doc-timestamp-f' into release-3.24
Merge-request: !7796
2022-10-14 11:33:14 -04:00
Brad King
367f10f4cb Merge branch 'doc-timestamp-f' into release-3.23
Merge-request: !7796
2022-10-14 11:32:49 -04:00
Brad King
7d25ae7350 Help: Add versionadded for string(TIMESTAMP) %f specifier
This was accidentally left out of commit c050d6a01e (string(TIMESTAMP):
add %f specifier for microseconds, 2022-01-27, v3.23.0-rc1~59^2).
2022-10-14 11:28:38 -04:00
Marc Chevrier
4aa86da827 Xcode: ensure framework with custom output directory can be consumed
Fixes: #24046
2022-10-14 09:13:37 -04:00
Brad King
20bfbf7838 Merge topic 'FindGLUT-pkg-config-HINTS' into release-3.25
a2fc4b6257 FindGLUT: Drop the now-unnecessary exclusion of pkg-config for multiconfig
a60a33dcb0 FindGLUT: Drop the now-unnecessary ALLOW_SYSTEM_CFLAGS logic
4ad57224b5 FindGLUT: Use pkg-config's results as HINTS for normal search

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Christopher Degawa <cddegawa@gmail.com>
Merge-request: !7770
2022-10-14 09:05:38 -04:00
Brad King
06b6cece7b Merge topic 'doc-typo' into release-3.25
f9fd27a5ee Help: Fix typo that crashes older pygments lexers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !7792
2022-10-14 08:48:22 -04:00
Brad King
f9fd27a5ee Help: Fix typo that crashes older pygments lexers
In commit cb14ae2b87 (try_compile: Add SOURCE_FROM_{ARG,VAR},
2022-09-21, v3.25.0-rc1~94^2~2) we accidentally added unbalanced closing
`]` characters in the `try_compile` and `try_run` signatures.

Fixes: #24053
2022-10-13 12:04:00 -04:00
leha-bot
a2fc4b6257 FindGLUT: Drop the now-unnecessary exclusion of pkg-config for multiconfig
Revert commit e0a62b84b5 (FindGLUT: On Windows and with multiple config
generator do not use pkg-config, 2022-09-27, v3.25.0-rc1~69^2). We now
call `select_library_configurations()` even after using pkg-config,
which will handle the absent libraries on Debug/Release configurations.

Issue: #24028
2022-10-13 10:06:57 -04:00
leha-bot
a60a33dcb0 FindGLUT: Drop the now-unnecessary ALLOW_SYSTEM_CFLAGS logic
Revert commit 8041ca5df0 (FindGLUT: Fix GLUT_INCLUDE_DIRS with
pkg-config and /usr/include, 2022-05-11, v3.24.0-rc1~151^2).
As the main code path will always do `find_path()` which respects the
`CMAKE_FIND_ROOT_PATH_MODE_INCLUDE` variable and will search in system
paths depending on that variable.

Issue: #23474, #24028
2022-10-13 10:04:41 -04:00
leha-bot
4ad57224b5 FindGLUT: Use pkg-config's results as HINTS for normal search
Since commit f90d15458a (FindGLUT: Use pkg-config to find flags if
available, 2021-06-11, v3.22.0-rc1~469^2), pkg-config results are used
directly.  However, this is not compatible with other features of
CMake's find logic such as `CMAKE_FIND_ROOT_PATH` and per-config
results.  Switch to a convention already used by pkg-config support in
other find modules, in which the pkg-config results are only used as
hints for the main search logic.

Fixes: #24028
2022-10-13 10:02:46 -04:00
Brad King
ffad2c44d7 Merge topic 'correct_cufile_linkage' into release-3.25
eefba0fb02 FindCUDAToolkit: cuFile_rdma_static needs to link to cuFile_static

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7785
2022-10-13 09:54:05 -04:00
Robert Maynard
eefba0fb02 FindCUDAToolkit: cuFile_rdma_static needs to link to cuFile_static 2022-10-12 13:26:05 -04:00
Brad King
ed084886b7 CMake 3.25.0-rc1 v3.25.0-rc1 2022-10-12 10:23:58 -04:00
Brad King
8cfd8a6486 Merge topic 'doc-gen' into release-3.25
9e8b8bf4ef Help: Document version when COMPILE_LANGUAGE genex accepts multiple languages
16f37ea7a0 Help: Document comma-separation in some generator expressions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7784
2022-10-12 10:21:02 -04:00
Brad King
2df2e1e9df Merge topic 'doc-cmake-E-subcommand-suboptions' into release-3.25
26020fdaae Help: Reference options of sub-commands in some older release notes (>= 3.20)
c3ec1b7411 Help: Replace the ref `cmake --workflow --preset` with `option` role
a0349eb13f Help: Make cmake(1) sub-command options look like other options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7782
2022-10-12 10:20:09 -04:00
Michael Hirsch
9e8b8bf4ef Help: Document version when COMPILE_LANGUAGE genex accepts multiple languages 2022-10-12 09:42:36 -04:00