mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-28 01:49:23 -05:00
Code Issues Packages Projects Releases Wiki Activity
53,385 Commits 2 Branches 401 Tags
8dcdd4351fd6236f05fbb613cd805fb41d2a1865
Commit Graph

53385 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gregor Jasny 8dcdd4351f Tests: recognize Xcode 13 linker warning 
The linker shipped with Xcode 13 changed the architecture
mismatch linker warning into:

```
ld: warning: ignoring file libfoo.a, building for macOS-x86_64 but attempting to link with file built for macOS-i386
```
 2021-06-10 22:24:31 +02:00
Kitware Robot 2086b938a7 CMake Nightly Date Stamp 2021-06-10 00:01:12 -04:00
Brad King 5e26887c35 Merge topic 'msvc-link-merge-fix' 
a9f992434d VS: Remove the /MERGE flag from FlagTables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6205
 2021-06-09 08:06:07 -04:00
Brad King fee0619e7c Merge topic 'help-presets' 
b00512e692 Help: presets: add note for ExternalProject users with env vars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !6201
 2021-06-09 08:05:21 -04:00
Brad King 5c18c8a178 Merge topic 'ctest_measurement_file' 
cbcb92d1cb ctest: add support for attaching files to tests at run time

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6192
 2021-06-09 08:04:23 -04:00
Brad King 1d225c5c0c Merge topic 'ci-asan' 
20bc209a0c gitlab-ci: add clang asan job
19d831b03d ci: add compiler-rt to Fedora base image
fda060f030 LexerParser: Do not leak Fortran parser tokens discarded due to errors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6200
 2021-06-09 08:02:34 -04:00
Brad King d42933d03b Merge branch 'release-3.20' 2021-06-09 07:57:35 -04:00
Brad King 072f8b7d0e Merge topic 'presets-build-fixes' 
de2b14a711 Merge branch 'backport-3.20-presets-build-fixes' into presets-build-fixes
534c40e6d8 presets: Fix buildPreset "targets" not allowing a single string
5d67632813 presets: Fix buildPreset "jobs"
93e396b402 presets: Fix buildPreset "jobs" field test case
efe7ac9022 presets: Fix buildPreset "targets" not allowing a single string

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !6190
 2021-06-09 07:57:34 -04:00
Brad King e3c420a74f Merge topic 'presets-build-fixes' into release-3.20 
534c40e6d8 presets: Fix buildPreset "targets" not allowing a single string
5d67632813 presets: Fix buildPreset "jobs"
93e396b402 presets: Fix buildPreset "jobs" field test case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !6190
 2021-06-09 07:57:34 -04:00
Brad King 5d8cb4be48 Merge branch 'release-3.20' 2021-06-09 07:56:28 -04:00
Brad King 12fc4f1239 Merge topic 'irsl-intel-oneapi-windows' into release-3.20 
6d4c51c29e IRSL: Add Intel oneAPI redist location on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6199
 2021-06-09 07:56:28 -04:00
Brad King 3394dcb64f Merge topic 'irsl-intel-oneapi-windows' 
6d4c51c29e IRSL: Add Intel oneAPI redist location on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6199
 2021-06-09 07:56:28 -04:00
Brad King 7aad9e8685 Merge topic 'add_hip_language' 
8514ee9b31 HIP: analyze output of `hipcc` to determine default GPU architecture
20d086f1a2 HIP: All HIP tests now run on CMake's current AMD hardware
2e86e50c2f HIP: Add HIP to all the Check* modules
947dbed0aa HIP: Automatically inject the `hip::device` runtime target
b50bfc8913 HIP: Add language to CMake
ff0d2858e1 HIP: Extract clang compiler details from hipcc
bd844387df ROCMClang: Add the ROCm toolkit derived clang compiler to CMake
590553f322 Compilers: protect use of  __has_include
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Zack Galbreath <zack.galbreath@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Acked-by: Axel Huebl <axel.huebl@plasma.ninja>
Merge-request: !6121
 2021-06-09 07:53:32 -04:00
Kitware Robot b6faa5e2df CMake Nightly Date Stamp 2021-06-09 00:01:13 -04:00
Duncan Ogilvie a9f992434d VS: Remove the /MERGE flag from FlagTables 
Fixes #22229
 2021-06-08 23:23:38 +02:00
Brad King c63ad0c2d1 Merge topic 'depfile-no-vstlog' 
143f7fe61a Tests: Remove unused RunCMake.TransformDepfile files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6203
 2021-06-08 13:48:19 -04:00
Brad King 143f7fe61a Tests: Remove unused RunCMake.TransformDepfile files 
Remove files missed by commit f0e9d74a2d (cmake_transform_depfile:
Remove unused incomplete vstlog support, 2021-06-02).
 2021-06-08 13:10:02 -04:00
Michael Hirsch b00512e692 Help: presets: add note for ExternalProject users with env vars 
Although this behavior is implied in the existing help text, I think
this use case is common and could be puzzling to those who do not
thoroughly read the existing help text. I think that warrants
a "Note:" on this page.
 2021-06-08 12:13:49 -04:00
Brad King 20bc209a0c gitlab-ci: add clang asan job 2021-06-08 09:54:08 -04:00
Zack Galbreath cbcb92d1cb ctest: add support for attaching files to tests at run time 
Allow tests to specify files to upload at runtime. Previously this was
only possible to specify at configure time with the ATTACHED_FILES
test properties.

This commit also fixes a bug in how our test data tarballs were generated
by CTest. Previously, if you tried to attach a file outside of the binary
directory, CTest would generate a tar file with a relative path, and tar
would not allow you to extract it. We resolve this problem by creating
tar files with a flat directory structure instead.

Fixes: #22284
 2021-06-08 09:27:19 -04:00
Brad King 19d831b03d ci: add compiler-rt to Fedora base image 
This is needed for `clang -fsanitize=` flags.
 2021-06-08 09:13:50 -04:00
Brad King fda060f030 LexerParser: Do not leak Fortran parser tokens discarded due to errors 2021-06-08 09:13:50 -04:00
Brad King 6d4c51c29e IRSL: Add Intel oneAPI redist location on Windows 
Fixes: #22283
 2021-06-08 09:07:37 -04:00
Brad King acb25d50d9 Merge topic 'install-with-runtime-dependencies' 
8d898cb3e1 FileAPI: Add integration for runtime dependency installers
72f2448e82 Help: Add documentation for runtime dependency installation
0c3c6acaff Tests: Add tests for new options
4910132d8c install: Add RUNTIME_DEPENDENCY_SET mode
bc8a4a06a4 install(IMPORTED_RUNTIME_ARTIFACTS): Add RUNTIME_DEPENDENCY_SET option
3e7d3c252a install(TARGETS): Add RUNTIME_DEPENDENCY_SET argument
ed3633d88c install(TARGETS): Add RUNTIME_DEPENDENCIES option
f2617cf8e6 Source: Add cmInstallRuntimeDependencySet
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6186
 2021-06-08 08:09:04 -04:00
Brad King 3653dc6069 Merge topic 'grd-win-objdump-newline' 
100d3cb392 file(GET_RUNTIME_DEPENDENCIES): Use cmSystemTools::GetLineFromStream()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !6198
 2021-06-08 08:07:34 -04:00
Brad King df1398aa97 Merge topic 'openssl-static' 
98fa09d5be FindOpenSSL: Link with ws2_32 and crypt32 on Windows/static

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6197
 2021-06-08 08:05:37 -04:00
Brad King d1517a4ef9 Merge topic 'compile-options-order' 
8f68bcad8f Tests: Add cases verifying flag ordering rules
ccc83ce162 Help: Document order of flags from CMAKE_<LANG>_FLAGS and COMPILE_OPTIONS
df79fe055b Help: Remove incorrect "versionadded" for CMAKE_<LANG>_FLAGS_<CONFIG>
c48d2d8480 VS: Place per-source preprocessor definitions after target-wide ones

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6187
 2021-06-08 08:04:16 -04:00
Brad King 105e108836 Merge topic 'cpack-deb-minor-fixes' 
ed1f3a5fa5 CPackDeb: output the error message when no description can be made
ece24b343a Help/cpack_gen/freebsd: improve wording for Debian fallbacks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !6196
 2021-06-08 08:01:44 -04:00
Brad King 34eefc6ea3 Merge topic 'FindPkgConfigAlwaysAddTarget' 
6f14205e08 FindPkgConfig: Always create the imported target
07d6390728 Tests: Add case covering FindPkgConfig creation of empty targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6113
 2021-06-08 08:00:24 -04:00
Sam Freed de2b14a711 Merge branch 'backport-3.20-presets-build-fixes' into presets-build-fixes 2021-06-08 07:49:50 -04:00
Sam Freed 534c40e6d8 presets: Fix buildPreset "targets" not allowing a single string 
Fixes: #22272
 2021-06-08 07:47:54 -04:00
Sam Freed 5d67632813 presets: Fix buildPreset "jobs" 
Fixes: #22273
 2021-06-08 07:47:24 -04:00
Brad King 93e396b402 presets: Fix buildPreset "jobs" field test case 
Avoid passing parallel build options to Make tools that do not support
them.
 2021-06-08 07:47:20 -04:00
Kitware Robot 4c940e50bf CMake Nightly Date Stamp 2021-06-08 00:01:10 -04:00
Craig Scott 05d8a586fa Merge topic 'doc-CMAKE_CFG_INTDIR' 
41dea08423 Help: Remove recommendations for using CMAKE_CFG_INTDIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Merge-request: !6195
 2021-06-07 17:32:58 -04:00
Kyle Edwards 100d3cb392 file(GET_RUNTIME_DEPENDENCIES): Use cmSystemTools::GetLineFromStream() 
Fixes: #22278
 2021-06-07 15:35:48 -04:00
Zack Galbreath 8514ee9b31 HIP: analyze output of hipcc to determine default GPU architecture 2021-06-07 19:25:34 +00:00
Robert Maynard 20d086f1a2 HIP: All HIP tests now run on CMake's current AMD hardware 2021-06-07 19:25:33 +00:00
Robert Maynard 2e86e50c2f HIP: Add HIP to all the Check* modules 2021-06-07 19:25:33 +00:00
Robert Maynard 947dbed0aa HIP: Automatically inject the hip::device runtime target 
Any target that might need to link to hip code needs the `hip::device`
target
 2021-06-07 19:25:33 +00:00
Robert Maynard b50bfc8913 HIP: Add language to CMake 2021-06-07 19:25:33 +00:00
Robert Maynard ff0d2858e1 HIP: Extract clang compiler details from hipcc 2021-06-07 19:25:33 +00:00
Robert Maynard bd844387df ROCMClang: Add the ROCm toolkit derived clang compiler to CMake 2021-06-07 19:25:28 +00:00
Zack Galbreath 590553f322 Compilers: protect use of __has_include 
If the compiler does not have __has_include, pretend the answer is always no
 2021-06-07 19:25:09 +00:00
Sam Freed efe7ac9022 presets: Fix buildPreset "targets" not allowing a single string 
Fixes: #22272
 2021-06-07 13:56:44 -04:00
Brad King 8f68bcad8f Tests: Add cases verifying flag ordering rules 2021-06-07 13:39:21 -04:00
Brad King 8732749ef4 Merge topic 'vs-flag-tables' 
887e9df0c7 VS: Update v142 CL flag table for VS 16.10
25e33a282b VS: Update v141 CL flag table for VS 15.9
f9383e0140 VS: Re-order v141 and v142 CL flag table entries to match xml files better

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6191
 2021-06-07 13:26:29 -04:00
Brad King 72ea35b0ee Merge branch 'release-3.20' 2021-06-07 13:22:04 -04:00
Brad King 79e3c6221a Merge topic 'FindBoost-json-header' 
c44dfdfdbb FindBoost: Add check for json component header in Boost 1.75+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6193
 2021-06-07 13:22:04 -04:00
Brad King f092fe677f Merge topic 'FindBoost-json-header' into release-3.20 
c44dfdfdbb FindBoost: Add check for json component header in Boost 1.75+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6193
 2021-06-07 13:22:03 -04:00