Commit Graph

58049 Commits

Author SHA1 Message Date
Tom Stellard 01d05985fd Tests: Pass -fno-lto to the Assembler test when using clang 2022-06-30 22:29:18 +00:00
Brad King 7375542615 Merge topic 'FindCURL-package-version'
886ba0b1d6 FindCURL: Set CURL_VERSION_STRING when curl is found as a package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7421
2022-06-30 08:35:55 -04:00
Brad King ac977c52a6 Merge branch 'release-3.24' 2022-06-30 08:25:13 -04:00
Brad King e561eaa18a Merge branch 'release-3.23' 2022-06-30 08:25:09 -04:00
Brad King 6b2bcae7d4 Merge branch 'release-3.23' into release-3.24 2022-06-30 08:24:57 -04:00
Brad King 529004738a Merge branch 'file-set-crash' into release-3.23
Merge-request: !7420
2022-06-30 08:22:27 -04:00
Brad King 93b2278186 Merge branch 'release-3.24' 2022-06-30 08:20:24 -04:00
Brad King 5a460f3243 Merge topic 'file-set-crash'
3fee5398bd install(EXPORT): Check for missing file sets at generate time

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7420
2022-06-30 08:20:24 -04:00
Brad King 6bc597b30e Merge topic 'file-set-crash' into release-3.24
3fee5398bd install(EXPORT): Check for missing file sets at generate time

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7420
2022-06-30 08:20:23 -04:00
Kitware Robot 4c2cead0c3 CMake Nightly Date Stamp 2022-06-30 00:01:09 -04:00
Kyle Edwards 3fee5398bd install(EXPORT): Check for missing file sets at generate time
Missing file sets were originally checked at configure time in
install(TARGETS ... EXPORT), but were not checked at generate time. If
a file set was added after install(TARGETS ... EXPORT) was called,
an abortion error was thrown. Check again at generate time to gracefully
display an error message instead of crashing.

Fixes: #23680
2022-06-29 15:05:32 -04:00
Brad King b1d8141534 Merge topic 'log_level_command'
23bbac941a Add cmake_language(GET_MESSAGE_LOG_LEVEL) sub command
2b6ef864e0 Move LogLevel enum out of cmake.h header

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7348
2022-06-29 08:52:13 -04:00
Brad King c42a9dfce0 Merge topic 'lcc-updates'
22a2b9c49f Tests: Fix Java tests on multi-config generators
b05d297964 Tests: handle a case when hg executable is broken
2faabab644 Tests: don't fail tests on broken E2K Java RVM
1462a1e15d Tests: check for shlibdeps symbols/shlibs before testing it
070e217399 Tests: enable Java tests if javac is a recurse symlink
7545d1ca9f Tests: don't use broken makensis
f11c12f9c8 Source: Suppress some warnings on LCC 1.23.x
de16db0f64 curl: make libcmcurl buildable with old LibreSSL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7418
2022-06-29 08:48:13 -04:00
Brad King 4262ab1bb0 Merge branch 'release-3.24' 2022-06-29 08:46:31 -04:00
Brad King ca8720c6af Merge topic 'FetchContent-avoid-IN_LIST'
5c7b6b29f9 FetchContent: Don't use if(... IN_LIST ...)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7423
2022-06-29 08:46:31 -04:00
Brad King c24620fa8b Merge topic 'FetchContent-avoid-IN_LIST' into release-3.24
5c7b6b29f9 FetchContent: Don't use if(... IN_LIST ...)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7423
2022-06-29 08:46:30 -04:00
Brad King 55ceba8911 Merge branch 'release-3.24' 2022-06-29 08:43:29 -04:00
Brad King edad647dd9 Merge topic 'fix-23523'
10668f26c9 AUTOUIC: Fix internal paths of generated ui_foo.h files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7419
2022-06-29 08:43:28 -04:00
Brad King 18c0ff66b2 Merge topic 'fix-23523' into release-3.24
10668f26c9 AUTOUIC: Fix internal paths of generated ui_foo.h files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7419
2022-06-29 08:43:27 -04:00
Kitware Robot 3a3e5462d0 CMake Nightly Date Stamp 2022-06-29 00:01:13 -04:00
Craig Scott 5c7b6b29f9 FetchContent: Don't use if(... IN_LIST ...)
This avoids the need for changing policy settings, which would then
propagate through to projects brought into the build via FetchContent.
2022-06-29 07:54:06 +10:00
Josiah Bills 10668f26c9 AUTOUIC: Fix internal paths of generated ui_foo.h files
For every file foo.ui we generate a ui_foo.h file in
${target}_autogen/include or ${target}_autogen/include_$<CONFIG> in the
multi-config case.  Even .ui files in subdirectories are handled this
way.  That means, .ui files with the same base name will conflict in a
target.

However, for .ui files in subdirectories we added generated sources with
the nonexistent path ${target}_autogen/include/subdir/ui_foo.h.  This
patch fixes that.

Also, CMake will now yield an error if a target has multiple .ui files
with the same base name.

Fixes #23523
2022-06-28 17:26:28 +02:00
makise-homura 886ba0b1d6 FindCURL: Set CURL_VERSION_STRING when curl is found as a package
FindCURL, when found as `curl-config.cmake`, will fill `CURL_VERSION`
instead of `CURL_VERSION_STRING` variable.  It may break some cases
when user is relying on correct value of the latter variable, and
as an example, already breaks `CMakeOnly.AllFindModules` test.
2022-06-28 11:15:24 -04:00
makise-homura 22a2b9c49f Tests: Fix Java tests on multi-config generators
Java.NativeHeaders test was not passing on
t:fedora36-ninja-multi pipeline. This is due to
paths being not set because of $<CONFIG> being used
at --test-command, but not being used at the actual
CTest invocation.
Now the correct variable is used there.
2022-06-28 11:12:41 -04:00
makise-homura b05d297964 Tests: handle a case when hg executable is broken
OS Elbrus 6.0-rc1 to rc3 have hg executable broken
because of python2 and python3 module directories conflict.
Here, we avoid hg related tests if such case is detected.
2022-06-28 11:12:04 -04:00
makise-homura 2faabab644 Tests: don't fail tests on broken E2K Java RVM
Java RVM on E2K architecture is known to be broken
prior to RVM version 3.5.2 (they crash with SIGILL
in some circumstances). That disallows tests like
Java.Javah, Java.Jar, and Java.NativeHeaders to pass.
Now, if such RVM is detected, these test are not being run.
2022-06-28 11:12:04 -04:00
makise-homura 1462a1e15d Tests: check for shlibdeps symbols/shlibs before testing it
OS Elbrus 6.x has totally broken dpkg-shlibdeps; 7.1 has
a working one, but still no symbols/shdibdeps files, so
generated dependencies are also empty. Since this commit,
we're checking if these files exist, and if not, we skip
the CPackComponentsDEB-components-depend2 test.
2022-06-28 11:12:04 -04:00
makise-homura 070e217399 Tests: enable Java tests if javac is a recurse symlink
There are distros (OS Elbrus 6.x, 7.x, Ubuntu 21.x)
where javac is a recurse symlink, like /usr/bin/javac ->
/etc/alternatives/javac -> /usr/lib/jvm/.../bin/javac.
On these distros, Java tests were not run, because
Tests/CMakeLists.txt was not able to handle this case
correctly. Now an additional stage of resolving symlinks
is added, and these distros have Java tests running.
2022-06-28 11:12:04 -04:00
makise-homura 7545d1ca9f Tests: don't use broken makensis
Some distros (OS Elbrus less than 7.0) have unrunnable
makensis. While performing tests, this condition is now
checked, and NSIS CPack generator test is not performed.
2022-06-28 11:12:04 -04:00
makise-homura f11c12f9c8 Source: Suppress some warnings on LCC 1.23.x
LCC 1.23.x (confirmed for 1.23.10, 1.23.19, maybe others)
issues -Wunused-function warning on the following functions:
Source/cmFileAPICodemodel.cxx:126, ValueEq()
Source/cmFileAPICodemodel.cxx:130, ValueLess()
Source/cmGeneratorExpressionNode.cxx:630, back()
This fix makes it silent for compatibility.
This is not a subject for newer LCC versions, like 1.25 and 1.26.
On LCC 1.21 CMake is not buildable, and 1.22 and 1.24 are not
tested, as they are internal development versions. Thus, the fix
is only applied if LCC 1.23 is detected.
2022-06-28 11:12:04 -04:00
makise-homura de16db0f64 curl: make libcmcurl buildable with old LibreSSL
LibreSSL older than 2.6.0 is not supported correctly
in upstream curl, and as a consequence, in libcmcurl.
Such LibreSSL versions can be used in old distros,
like OS Elbrus 4.x and 5.x, so until this fix, CMake
wasn't buildable there either.
2022-06-28 11:12:04 -04:00
Alexandru Croitor 23bbac941a Add cmake_language(GET_MESSAGE_LOG_LEVEL) sub command
The new sub-command writes a string representation of the
current log level to the output variable given to the
sub-command.

Given that the log-level might be set either via the --log-level
command line option or via the CMAKE_MESSAGE_LOG_LEVEL
cache / regular variables, the priority for each of the log level
sources is as follows, with the first one being the highest:
1) --log-level
2) CMAKE_MESSAGE_LOG_LEVEL regular variable
3) CMAKE_MESSAGE_LOG_LEVEL cache variable
4) default log level (STATUS)

Fixes: #23572
2022-06-28 16:03:22 +02:00
Brad King 31cbe200f3 Merge topic 'posix_c'
e1adddc74e RunCMake/CXXModules/NoCXX20: Force older standard
3f7ebf9354 RunCMake/CTestTimeout: Include sched.h for pid_t
8eb8d16c19 cmSystemTools: Fix unsetenv() fallback
324ca5b489 Tests/CTestTestFdSetSize: Support plain POSIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7408
2022-06-28 09:28:08 -04:00
Raul Tambre e1adddc74e RunCMake/CXXModules/NoCXX20: Force older standard
Compile features ensure a compiler is aware of a standard version, but the one
actually used may be newer. The test relies on the standard chosen being
pre-C++20, so force C++17 explicitly.

This was exposed by a nightly bot that has a compiler defaulting to C++23. The
test would've broken anyway in a few years once GCC or Clang upped their
default.
2022-06-28 09:27:29 -04:00
Brad King 6931487e52 Merge topic 'glew'
6c8789af75 FindGLEW: select_library_configuration might be used before it is defined

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7412
2022-06-28 09:24:24 -04:00
Brad King b64db8e736 Merge branch 'release-3.24' 2022-06-28 09:22:56 -04:00
Brad King 3fcdc98b7d Merge topic 'FindPython-multiple-queries'
ece3bedbf2 FindPython: fix error on multiple queries with different COMPONENTS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7410
2022-06-28 09:22:55 -04:00
Brad King e9213013e6 Merge topic 'FindPython-multiple-queries' into release-3.24
ece3bedbf2 FindPython: fix error on multiple queries with different COMPONENTS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7410
2022-06-28 09:22:54 -04:00
Brad King 6f55f5847d Merge branch 'release-3.24' 2022-06-28 09:21:14 -04:00
Brad King f908b4b1e9 Merge topic 'depguide-fetchcontent-versioning'
8d8d8ac772 Help: Mark features new to 3.24 in Using Dependencies Guide

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7411
2022-06-28 09:21:14 -04:00
Brad King f0740662a6 Merge topic 'depguide-fetchcontent-versioning' into release-3.24
8d8d8ac772 Help: Mark features new to 3.24 in Using Dependencies Guide

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7411
2022-06-28 09:21:13 -04:00
Brad King e646b1fce7 Merge branch 'release-3.24' 2022-06-28 09:20:24 -04:00
Brad King f7d71beefa Merge topic 'revert-FindHDF5-library'
b5bc72574e FindHDF5: Revert "Add explicit library location instead of guessed ..."

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7416
2022-06-28 09:20:24 -04:00
Brad King 353a1357a7 Merge topic 'revert-FindHDF5-library' into release-3.24
b5bc72574e FindHDF5: Revert "Add explicit library location instead of guessed ..."

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7416
2022-06-28 09:20:23 -04:00
Brad King bbb20d7387 Merge branch 'release-3.24' 2022-06-28 09:19:36 -04:00
Brad King 3dd5b864f3 Merge topic 'doc-osx-cmp0126'
3fac3d365d Help: Mention CMP0126 in CMAKE_OSX_* variable documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7414
2022-06-28 09:19:35 -04:00
Brad King 81a51a8628 Merge topic 'doc-osx-cmp0126' into release-3.24
3fac3d365d Help: Mention CMP0126 in CMAKE_OSX_* variable documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7414
2022-06-28 09:19:34 -04:00
Brad King 6e36487958 Merge branch 'release-3.24' 2022-06-28 09:16:33 -04:00
Brad King 754af8f4c7 Merge branch 'release-3.23' 2022-06-28 09:16:31 -04:00
Brad King 3daad63ccb Merge branch 'release-3.23' into release-3.24 2022-06-28 09:16:22 -04:00