Commit Graph

48330 Commits

Author SHA1 Message Date
Brad King 3a9b257ee7 Merge topic 'cmake_language-check-invalid-commands'
12e483c563 cmake_language: check CALL with control command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4788
2020-05-27 08:17:49 -04:00
Brad King 0bc408bad5 Merge branch 'release-3.17' 2020-05-27 08:14:22 -04:00
Brad King 6fac882730 Merge topic 'ctest-repeat-notrun'
0a74d7c2b8 Merge branch 'backport-ctest-repeat-notrun' into ctest-repeat-notrun
bbb62dcc72 CTest: Make sure NOT_RUN tests show up in the failed test log
c503251997 Tests: Add coverage of ctest_test RETURN_VALUE and REPEAT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4801
2020-05-27 08:14:21 -04:00
Brad King 6fce0cbcab Merge topic 'ctest-repeat-notrun' into release-3.17
bbb62dcc72 CTest: Make sure NOT_RUN tests show up in the failed test log
c503251997 Tests: Add coverage of ctest_test RETURN_VALUE and REPEAT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4801
2020-05-27 08:14:21 -04:00
Brad King e53173f4f8 Merge branch 'release-3.17' 2020-05-27 08:13:10 -04:00
Brad King 6e1079dfdb Merge branch 'release-3.16' into release-3.17 2020-05-27 08:12:20 -04:00
Brad King 45e57756e2 Merge branch 'release-3.16' 2020-05-27 07:20:44 -04:00
Brad King 0a74d7c2b8 Merge branch 'backport-ctest-repeat-notrun' into ctest-repeat-notrun 2020-05-27 06:45:39 -04:00
Robert Maynard bbb62dcc72 CTest: Make sure NOT_RUN tests show up in the failed test log
Issue: #20543
2020-05-27 06:43:01 -04:00
Robert Maynard c503251997 Tests: Add coverage of ctest_test RETURN_VALUE and REPEAT 2020-05-27 06:39:17 -04:00
Brad King e14974a208 CMake 3.16.7 v3.16.7 2020-05-27 06:13:45 -04:00
Kitware Robot d08232f87a CMake Nightly Date Stamp 2020-05-27 00:01:14 -04:00
Brad King 614e93c563 Merge topic 'test-vs-generator'
9812e87ee4 gitlab-ci: add a test of the VS generator based off of the ninja build
e63fe4a588 ci: add a script to run the tests with an external CMake
9893e159cc ci: support setting the generator platform and toolset
e0b9e8fba8 ci: test the configuration that was built
f00ab86f1f ci: use BOOL for boolean settings
deb5194a32 tests: avoid a warning for ctresalloc
f5e6738051 gitlab-ci: get the VS2019 location from the runner
79f3790c1a gitlab-ci: get sccache location from the runner on Windows
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4794
2020-05-26 15:37:35 -04:00
Ben Boeckel 9812e87ee4 gitlab-ci: add a test of the VS generator based off of the ninja build 2020-05-26 12:50:16 -04:00
Ben Boeckel e63fe4a588 ci: add a script to run the tests with an external CMake 2020-05-26 12:50:16 -04:00
Ben Boeckel 9893e159cc ci: support setting the generator platform and toolset 2020-05-26 12:50:16 -04:00
Ben Boeckel e0b9e8fba8 ci: test the configuration that was built 2020-05-26 12:50:16 -04:00
Ben Boeckel f00ab86f1f ci: use BOOL for boolean settings 2020-05-26 12:50:16 -04:00
Ben Boeckel deb5194a32 tests: avoid a warning for ctresalloc
When testing an installed CMake, this executable does not exist.

Also remove the "or build" because we are expecting it to be built if
the target exists (and is a build failure if it fails there).
2020-05-26 12:50:16 -04:00
Ben Boeckel f5e6738051 gitlab-ci: get the VS2019 location from the runner 2020-05-26 12:50:16 -04:00
Ben Boeckel 79f3790c1a gitlab-ci: get sccache location from the runner on Windows
When the sccache executable is in the build directory, it can fail to be
removed if the daemon is still running when another job starts. It
continues to run when a job is canceled or fails and then is "in use"
and cannot be deleted.
2020-05-26 12:50:16 -04:00
Ben Boeckel b368c2d2f7 gitlab-ci: delay manual jobs on merges for 5 minutes
This should avoid races with merge trains canceling in-progress builds
leaving "rubble" around for further builds to trip over.
2020-05-26 12:50:16 -04:00
Brad King 7c0e5fcf63 Merge topic 'reduce-initial-checks'
1d21dd0f7c enable_language: Assume compiler works if ABI detection compiles
7a01250581 CMakeDetermineCompilerABI: Fold copy error into CMAKE_<LANG>_ABI_COMPILED

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4789
2020-05-26 09:26:10 -04:00
Brad King 279f6f0c2c Merge topic 'liblzma-reduce-checks'
d8359713e5 liblzma: Assume 'string.h' exists
12e7bfcbf4 liblzma: Use KWIML to get fixed-size integer types
3cd5ed7cb1 liblzma: Drop unused code providing uintmax_t and intmax_t

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4790
2020-05-26 08:26:08 -04:00
Brad King 2ecb8698b7 Merge topic 'cuda-clang-pthreads'
80d37167fe Find{Threads,MPI}: Add support for CUDA with Clang

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !4781
2020-05-26 08:25:23 -04:00
Brad King b6d9c3e459 Merge topic 'xerces-cygwin-library-naming'
b59c127df2 FindXercesC: Find Cygwin libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4783
2020-05-26 08:24:16 -04:00
Marc Chevrier 12e483c563 cmake_language: check CALL with control command
Fixes: #20739
2020-05-26 07:27:35 -04:00
Brad King c7d067626d Merge topic 'gitlab-ci-run-when-merged'
d8fb1ffc9c gitlab-ci: use rules to only be manual on a merge request

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4791
2020-05-26 07:20:26 -04:00
Kitware Robot b8a6300e6e CMake Nightly Date Stamp 2020-05-26 00:01:19 -04:00
Ben Boeckel d8fb1ffc9c gitlab-ci: use rules to only be manual on a merge request 2020-05-25 20:07:04 -04:00
Craig Scott 800e29ab8f Merge topic 'fetchcontent-externalproject-empty-args'
8dca6bd04b FetchContent: Preserve empty string arguments
cbf2daeed0 ExternalProject: Preserve empty string arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4729
2020-05-25 17:20:48 -04:00
Brad King 98b2dc68ab Merge branch 'release-3.17' 2020-05-25 15:50:19 -04:00
Brad King 15e7259418 Merge topic 'doc-updates' into release-3.17
b3e4fb5144 Help: clarify add_definitions() and add_compile_definitions() behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4786
2020-05-25 15:50:18 -04:00
Brad King 3a1853b9fd Merge topic 'doc-updates'
b3e4fb5144 Help: clarify add_definitions() and add_compile_definitions() behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4786
2020-05-25 15:50:18 -04:00
Brad King d8359713e5 liblzma: Assume 'string.h' exists 2020-05-25 15:19:42 -04:00
Brad King 12e7bfcbf4 liblzma: Use KWIML to get fixed-size integer types 2020-05-25 15:16:56 -04:00
Brad King 3cd5ed7cb1 liblzma: Drop unused code providing uintmax_t and intmax_t
The lzma library code we use within CMake does not need these.
2020-05-25 15:06:34 -04:00
Brad King 1d21dd0f7c enable_language: Assume compiler works if ABI detection compiles
We run a `try_compile` with a tiny test source to check if the compiler
works so that we can fail early if it does not.  When the compiler does
work, we immediately `try_compile` the ABI detection source.  In the
common case that both steps work, we gain no useful information from the
first one and the work was wasted.

Re-order the checks to try the ABI detection first.  If it works then
assume the compiler works and skip the dedicated check.  If the ABI
check fails then proceed with the normal test for a working compiler so
the diagnostic can be shown as before.

Fixes: #18703
2020-05-25 14:39:40 -04:00
Brad King 7a01250581 CMakeDetermineCompilerABI: Fold copy error into CMAKE_<LANG>_ABI_COMPILED 2020-05-25 14:08:19 -04:00
Tobias Ribizel 80d37167fe Find{Threads,MPI}: Add support for CUDA with Clang
Currently CMake passes `-Xcompiler -pthread` flags to CUDA compilers
irrespective of the actual CUDA compiler ID.  This makes sure the
additional `-Xcompiler` flag is only used with nvcc.
2020-05-25 11:17:52 -04:00
Brad King 3ed8b663a9 Merge topic 'gitlab-ci-regular-builders'
b566f0b308 gitlab-ci: add windows builder
5b564c371e gitlab-ci: add Windows infrastructure
809f9a9916 gitlab: add powershell scripts for utilities
02c56b71a1 gitlab-ci: add a macos builder
a1b1fc611b gitlab-ci: add Linux makefiles and ninja builders
3e1a1ba92d ci: add dependencies for the test suite to the Fedora image
d5438f783a ci: add make to the CI image
0ed7e424ab gitlab-ci: use the cmake_build_unix anchor
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4723
2020-05-25 11:10:06 -04:00
Brad King a354b7f21e Merge topic 'CheckLinkerFlag-module'
af96c0f4fa CheckLinkerFlag: Add module to check validity of linker flags
3c4cc77d55 Tests: Extend Fortran compiler information

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4777
2020-05-25 10:59:01 -04:00
Marc Chevrier af96c0f4fa CheckLinkerFlag: Add module to check validity of linker flags
Fixes: #15934
2020-05-25 10:57:14 -04:00
Marc Chevrier 3c4cc77d55 Tests: Extend Fortran compiler information
Fill variable `CMake_Fortran_COMPILER_ID`.
2020-05-25 10:57:06 -04:00
Brad King b82bdbf44a Merge topic 'ep-git-update-strategy'
0aea435aa1 ExternalProject: Provide choice of git update strategies
ea410414c5 ExternalProject: factor out gitupdate step to separate file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4239
2020-05-25 10:53:26 -04:00
Brad King 15b9b41d72 Merge topic 'fileApiAddPrecompileHeadersBacktrace'
9f6d40ee23 fileapi: Extend codemodel targets with PRECOMPILE_HEADERS
b698764a31 Tests: Add a PCH example to RunCMake.FileAPI codemodel-v2
b3812c0e54 Tests: Fix indentation in RunCMake.FileAPI cxx_exe.json
9c48804b69 PCH: Fix source group of per-architecture PCH headers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4684
2020-05-25 10:40:56 -04:00
Brad King 54baf63965 Merge topic 'FindSquish_settingsgroup_removal'
8492ac1363 FindSquish: Remove settingsGroup argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4763
2020-05-25 10:37:11 -04:00
Brad King 5b2e68acb6 Merge topic 'curl-send-recv'
0a46eb11af curl: Avoid checking 'send' and 'recv' signatures

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4767
2020-05-25 10:36:12 -04:00
Brad King f7960e5488 Merge topic 'cuda-runtime-cleanup'
bcb44ac2ee CUDA: Simplify Clang implicit host linker settings
23519dd24f CUDA: Fix implicit runtime library filtering on Windows
16bed00712 CUDA: Refactor implicit library filtering
5c7ca6f8a8 CUDA: Move VS CudaRuntime selection to be with rest of CUDA options
4468acb979 CUDA: Factor runtime library lookup into helper method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4776
2020-05-25 10:35:13 -04:00
Brad King 7b56d0a377 Merge branch 'release-3.17' 2020-05-25 10:33:27 -04:00