Commit Graph

57279 Commits

Author SHA1 Message Date
Ben Boeckel cc4e19710d cmGlobalNinjaGenerator: use an extention based on the modmapfmt 2022-04-27 14:30:41 -04:00
Ben Boeckel 97a68198c9 cmGlobalNinjaGenerator: escape : in module names
Not all filesystems support `:` in the name, so replace it with `-`. As
`-` is not otherwise allowed in module names anyways, there is no risk
of conflict.
2022-04-27 14:30:41 -04:00
Ben Boeckel 499009b79c cmTarget: avoid creating export entries if they don't exist 2022-04-27 14:30:41 -04:00
Ben Boeckel 0513a1fe10 cmInstallGenerator: use CMake-private variables in generated code 2022-04-27 14:30:41 -04:00
Ben Boeckel 44a110eb80 cmInstallGenerator: fix default argument comments 2022-04-27 08:56:46 -04:00
Ben Boeckel 5f93cf4afe cmFileSet: support makefile-less error reporting of visibility 2022-04-27 08:56:46 -04:00
Brad King 4b63f2ca4a Merge topic 'FindThreads-cleanup'
c53748a377 FindThreads: Factor out helper macro for libc check
564385194b FindThreads: Avoid repeating check for -pthread flag
41ef904e81 FindThreads: Simplify conditions for not-in-libc checks
cbe7550d99 FindThreads: Remove unnecessary condition
1ee8c545dd FindThreads: Clarify internal helper macro names
5b5cd92363 FindThreads: Drop strange SunOS+pthread.h+thr_create combination
c9bd462c08 FindThreads: Drop unused internal CMAKE_HAVE_THREADS_LIBRARY variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Rolf Eike Beer <eike@sf-mail.de>
Merge-request: !7207
2022-04-27 08:53:18 -04:00
Brad King 54f7955382 Merge topic 'CUDAToolkit-cupti-include-dirs'
e6b51a1b01 CUDAToolkit: Add include paths for CUDA::cupti

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !7200
2022-04-27 08:50:07 -04:00
Brad King 5cfb2cead6 Merge topic 'file-set-simplifications'
9916d4dd44 cmTarget: factor out fileset type handling
79d6b928a3 RunCMake/target_sources: test `HEADERS` file sets via generic props
d74f9599f6 cmTarget: require filesets to be of the right type
5da4fe30a9 cmTarget: factor out fileset property manipulation
c89580487b cmTarget: pass candidate strings by const-ref
64ea1a272c messages: remove screamake from comments and errors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7145
2022-04-27 08:48:47 -04:00
Brad King 95a39dab54 Merge topic 'tests-no-c++98'
61bea8f3c8 Tests: Remove incidental use of C++98 compiler modes
02ec5c4ad2 Tests: Add missing include in sleep sources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !7206
2022-04-27 08:47:04 -04:00
Brad King 4df6e2b78a Merge branch 'release-3.23' 2022-04-27 08:43:49 -04:00
Brad King 967a1037b2 Merge topic 'FindBoost-1.79'
f90fb73651 FindBoost: Add support for Boost 1.79

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7205
2022-04-27 08:43:49 -04:00
Brad King 74c4762a38 Merge topic 'FindBoost-1.79' into release-3.23
f90fb73651 FindBoost: Add support for Boost 1.79

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7205
2022-04-27 08:43:48 -04:00
Kitware Robot b30228c7c1 CMake Nightly Date Stamp 2022-04-27 00:01:26 -04:00
Brad King c53748a377 FindThreads: Factor out helper macro for libc check 2022-04-26 13:54:53 -04:00
Brad King 564385194b FindThreads: Avoid repeating check for -pthread flag
When `THREADS_PREFER_PTHREAD_FLAG` is enabled, we check for it before
the thread libraries.  We do not need to check after them too.
2022-04-26 13:54:53 -04:00
Brad King 41ef904e81 FindThreads: Simplify conditions for not-in-libc checks
If `CMAKE_HAVE_LIBC_PTHREAD` is true, we also set `Threads_FOUND` to
true, which blocks all the other checks from running.
2022-04-26 13:54:53 -04:00
Brad King cbe7550d99 FindThreads: Remove unnecessary condition
The `THREADS_HAVE_PTHREAD_ARG` cache entry cannot be defined unless
FindThreads has already been executed, perhaps by a previous run of
CMake, or a previous `find_package(Threads)` call.  In that case, the
other alternatives will also already have been checked and results
cached.
2022-04-26 13:54:53 -04:00
Brad King 1ee8c545dd FindThreads: Clarify internal helper macro names 2022-04-26 13:54:53 -04:00
Brad King 5b5cd92363 FindThreads: Drop strange SunOS+pthread.h+thr_create combination
Solaris has provided pthreads for a long time, so we probably never
get to this combination anyway.
2022-04-26 13:54:53 -04:00
Brad King c9bd462c08 FindThreads: Drop unused internal CMAKE_HAVE_THREADS_LIBRARY variable
This internal variable has not been used since commit 46368eddfd
(FindThreads: move checking of the -pthread compiler flag into a macro,
2014-10-06, v3.1.0-rc1~21^2~2).  It has never been documented for public
use.
2022-04-26 13:54:53 -04:00
Peter Bell e6b51a1b01 CUDAToolkit: Add include paths for CUDA::cupti
CUDA's cupti library has its headers in a seperate directory on a
standard CUDA install, but `CUDA::cupti` only adds the default cuda
include directory.

Issue: #22761
2022-04-26 13:48:02 -04:00
Brad King 61bea8f3c8 Tests: Remove incidental use of C++98 compiler modes
Several tests specify use of C++98 mode since commit b0f277db38 (HP aCC:
record compiler flag for Ansi C++98 support for version 3.80 onwards,
2014-04-15, v3.1.0-rc1~550^2).  The motivating use case for those
changes was dropped by commit 49640d3629 (HP-UX: Drop support for
building CMake on HP-UX, 2017-08-04, v3.10.0-rc1~304^2), so remove the
use of C++98 mode too.  Also remove code that, on some compilers, used
C++11 instead of C++98, because we can now just use their default mode.
2022-04-26 12:01:06 -04:00
Brad King 02ec5c4ad2 Tests: Add missing include in sleep sources
Sources that use `atoi` need to include `<stdlib.h>`.
2022-04-26 12:01:06 -04:00
Brad King f90fb73651 FindBoost: Add support for Boost 1.79
Update the list of known versions.

Run the command

    cmake -DBOOST_DIR=/path/to/boost_1_79_0 \
      -P Utilities/Scripts/BoostScanDeps.cmake

to extract dependencies from the 1.79.0 source tree.
They are the same as 1.78's dependencies, so just update
the version check for warning about newer versions.

Fixes: #23452
2022-04-26 11:23:16 -04:00
Brad King 07a54b2bb2 Merge topic 'target-bundle-dir-name-genex'
997af2e1a6 Genex: Add TARGET_BUNDLE_DIR_NAME
627b2eba6c Help: Make TARGET_BUNDLE[_CONTENT]_DIR examples more precise

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7177
2022-04-26 11:15:47 -04:00
Brad King f5c96c4106 Merge branch 'release-3.23' 2022-04-26 11:13:40 -04:00
Brad King 6cca475bbf Merge branch 'release-3.22' 2022-04-26 11:13:38 -04:00
Brad King f06b8ff040 Merge branch 'release-3.21' 2022-04-26 11:13:36 -04:00
Brad King 7ba4d289c9 Merge branch 'release-3.22' into release-3.23 2022-04-26 11:13:27 -04:00
Brad King ad5bf708a6 Merge branch 'release-3.21' into release-3.22 2022-04-26 11:13:18 -04:00
Brad King 6872e4b5d9 Merge branch 'release-3.23' 2022-04-26 11:12:52 -04:00
Brad King e7de5894c7 Merge topic 'ci-xcode-13.3'
65b6daf776 gitlab-ci: update macOS jobs to use Xcode 13.3
94361a1309 Tests: Ignore all classes in Xcode internal objc warnings
da9f864513 Tests: Teach RunCMake to ignore Xcode extension point warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7204
2022-04-26 11:12:52 -04:00
Brad King 7e4d6bbe02 Merge topic 'ci-xcode-13.3' into release-3.23
65b6daf776 gitlab-ci: update macOS jobs to use Xcode 13.3
94361a1309 Tests: Ignore all classes in Xcode internal objc warnings
da9f864513 Tests: Teach RunCMake to ignore Xcode extension point warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7204
2022-04-26 11:12:51 -04:00
Brad King f48047251f Merge branch 'ci-xcode-13.3' into release-3.22
Merge-request: !7204
2022-04-26 11:12:28 -04:00
Brad King adcb98c51b Merge branch 'ci-xcode-13.3' into release-3.21
Merge-request: !7204
2022-04-26 11:12:02 -04:00
Brad King 28dc5ea910 Merge topic 'ci-python'
2c140ac7b1 ci: Avoid finding Python via Windows Registry

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7203
2022-04-26 10:27:20 -04:00
Brad King 2c140ac7b1 ci: Avoid finding Python via Windows Registry
Since commit 313ea361b0 (CMake: Use FindPython instead of
FindPythonInterp to build CMake itself, 2022-04-21), CI jobs on some
Windows hosts have been finding Python via the Windows Registry.
Explicitly disable the registry search so that the CI jobs find the
Python that we download and put in the PATH inside the job.
2022-04-26 09:29:37 -04:00
Kitware Robot a0061a8cf9 CMake Nightly Date Stamp 2022-04-26 00:01:15 -04:00
Ben Boeckel 9916d4dd44 cmTarget: factor out fileset type handling
This allows for new fileset types to be added more easily by factoring
out the declarative information into a structure.
2022-04-25 16:49:57 -04:00
Brad King 65b6daf776 gitlab-ci: update macOS jobs to use Xcode 13.3 2022-04-25 15:52:15 -04:00
Gregor Jasny 94361a1309 Tests: Ignore all classes in Xcode internal objc warnings
Xcode on Apple Silicon warns not only about AMSupportURL classes
but also many more.
2022-04-25 15:52:15 -04:00
Brad King da9f864513 Tests: Teach RunCMake to ignore Xcode extension point warnings
On some Xcode versions, `xcodebuild` may warn:

    ... xcodebuild[...] Requested but did not find extension point with
                        identifier ...

Teach RunCMake to drop such incidental lines before matching against
expected output.
2022-04-25 14:35:11 -04:00
Ben Boeckel 79d6b928a3 RunCMake/target_sources: test HEADERS file sets via generic props 2022-04-25 14:29:17 -04:00
Ben Boeckel d74f9599f6 cmTarget: require filesets to be of the right type
With new types being proposed for C++ modules, requiring filesets to be
of the right type is now pertinent. No tests can be added yet as only
`HEADERS` is supported right now.
2022-04-25 14:29:17 -04:00
Ben Boeckel 5da4fe30a9 cmTarget: factor out fileset property manipulation 2022-04-25 14:29:17 -04:00
Ben Boeckel c89580487b cmTarget: pass candidate strings by const-ref
This avoids having to copy the `std::string` overload.
2022-04-25 14:29:17 -04:00
Ben Boeckel 64ea1a272c messages: remove screamake from comments and errors 2022-04-25 14:29:17 -04:00
Brad King 7dc7907837 Merge topic 'ci-icu'
7d98d464b4 ci: Enable FindICU test on Linux builds
2228e545e1 ci: Add libicu to Debian and Fedora base images

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7199
2022-04-25 13:13:11 -04:00
Kitware Robot c6ead9be83 CMake Nightly Date Stamp 2022-04-25 00:01:23 -04:00