Commit Graph

48367 Commits

Author SHA1 Message Date
Marc Chevrier 1eca5993e2 ALIAS target: cannot overwrite an existing target
Fixes: #19616
2020-05-28 12:56:59 -04:00
Brad King 04b9b2b5f3 Merge topic 'macos-pin-xcode-versions'
35b29d3568 ci: disable java detection
72a7697901 gitlab-ci: pin macOS to a specific Xcode version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4812
2020-05-28 12:55:37 -04:00
Ben Boeckel 35b29d3568 ci: disable java detection 2020-05-28 12:46:31 -04:00
Ben Boeckel 72a7697901 gitlab-ci: pin macOS to a specific Xcode version 2020-05-28 11:40:32 -04:00
Brad King e46654815e Merge branch 'release-3.17' 2020-05-28 08:12:46 -04:00
Brad King e647949539 CMake 3.17.3 v3.17.3 2020-05-28 06:57:26 -04:00
Brad King 5fa7276489 Merge topic 'update-kwsys'
9c161cc2d0 Merge branch 'upstream-KWSys' into update-kwsys
c47501bcca KWSys 2020-05-27 (a3263389)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4804
2020-05-28 06:54:50 -04:00
Brad King 262ecc99d0 Merge topic 'multi-ninja-pch-object-library'
1f791eb160 Multi-Ninja: Fix reusable PCHs for MSVC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alexej Harm <alexej.h@xiphos.de>
Merge-request: !4787
2020-05-28 06:53:59 -04:00
Brad King c269724466 Merge topic 'reduce-try_compile'
bc681fc372 Hard-code some try_compile results for third-party libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4802
2020-05-28 06:52:59 -04:00
Brad King 54eeccbfb6 Merge topic 'openssl-3.0.0' into release-3.17
61d746e592 FindOpenSSL: Detect OpenSSL 3.0.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4805
2020-05-28 06:51:52 -04:00
Brad King 03fb79a669 Merge branch 'release-3.17' 2020-05-28 06:51:52 -04:00
Brad King 40748ec1d9 Merge topic 'openssl-3.0.0'
61d746e592 FindOpenSSL: Detect OpenSSL 3.0.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4805
2020-05-28 06:51:52 -04:00
Brad King 1b8b98a884 Merge topic 'fix-cpack-deb-generating-empty-paragraph' into release-3.17
6ba842163c CPack-deb: don't add a line with a dot to pkg desc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4806
2020-05-28 06:50:40 -04:00
Brad King 9bd7de0dac Merge branch 'release-3.17' 2020-05-28 06:50:40 -04:00
Brad King a1af643291 Merge topic 'fix-cpack-deb-generating-empty-paragraph'
6ba842163c CPack-deb: don't add a line with a dot to pkg desc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4806
2020-05-28 06:50:40 -04:00
Kitware Robot 2d90ec54a0 CMake Nightly Date Stamp 2020-05-28 00:01:15 -04:00
Jonathan Verner 6ba842163c CPack-deb: don't add a line with a dot to pkg desc
Currently, if the package description ends with a newline
(typically if it is read from a file) cpack -deb adds a single line
with a dot at the end which leads to a violation of the
`extended-description-contains-empty-paragraph` debian policy.

This commit fixes the above behaviour.

Fixes: #20763
2020-05-27 14:44:28 -04:00
Brad King 6b208d873e Merge topic 'cuda_user_architectures'
19cc5bc296 CUDA: Throw error if user-specified architectures don't work

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4800
2020-05-27 14:30:32 -04:00
Cristian Adam 1f791eb160 Multi-Ninja: Fix reusable PCHs for MSVC
Fixes: #20721
2020-05-27 14:19:03 -04:00
Brad King bc681fc372 Hard-code some try_compile results for third-party libraries
Our bundled third-party libraries perform many `try_compile` checks for
compatibility with their upstream build systems.  For many of the checks
we already know the result for compilers we support for building CMake
itself, especially on Windows.  Hard-code known results to avoid running
the checks.
2020-05-27 14:09:20 -04:00
Brad King 7a40d87036 Merge topic 'gitlab-ci-dir'
dc2f964e16 gitlab-ci: Use stable build path on Windows
fb20f4f70b gitlab-ci: Use a shorter work directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4807
2020-05-27 14:06:43 -04:00
Brad King dc2f964e16 gitlab-ci: Use stable build path on Windows 2020-05-27 12:56:33 -04:00
Brad King fb20f4f70b gitlab-ci: Use a shorter work directory 2020-05-27 12:55:26 -04:00
Vitezslav Cizek 61d746e592 FindOpenSSL: Detect OpenSSL 3.0.0
The OpenSSL versioning is changing with the upcoming 3.0.0 release.
https://www.openssl.org/blog/blog/2018/11/28/version/
Since 3.0.0, the patch letters are being dropped. The new format is:
MAJOR.MINOR.PATCH

The OPENSSL_VERSION variable can now be directly derived from the new
OPENSSL_VERSION_STR macro.
https://www.openssl.org/docs/manmaster/man3/OPENSSL_VERSION_NUMBER.html
2020-05-27 09:08:10 -04:00
Brad King 9c161cc2d0 Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-05-27 (a3263389)
2020-05-27 08:33:39 -04:00
KWSys Upstream c47501bcca KWSys 2020-05-27 (a3263389)
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit a3263389bcaab27fd62a23599d4ce9bdaa01479a (master).

Upstream Shortlog
-----------------

Brad King (7):
      ce4941c9 IOStream: Drop this component of KWSys
      49d04c2c hashtable: Drop this component of KWSys
      a0bd892c SystemInformation: Use 'long long' unconditionally
      441dd494 Drop unused checks for 'long long' and '__int64'
      2b749749 Drop unused C type macros check
      74daf33b Drop unused Borland and OpenWatcom preprocessor conditions
      c4e8126a Drop unused CXX cstdio check
2020-05-27 08:33:38 -04:00
Brad King 08f1ee1f53 Merge topic 'cuda_lib_x64'
f2df6f5446 CUDA: Check for lib/x64 library directory in Internal/CUDAToolkit

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4799
2020-05-27 08:22:17 -04:00
Brad King 340dcadb8b Merge topic 'update-gitlab-links'
eb705b9531 Update links to gitlab.kitware.com repos to add `-/`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4795
2020-05-27 08:21:20 -04:00
Brad King 6bfc6f6abc Merge topic 'cmState-unused-method'
0b837ab371 cmState: Drop unused and unimplemented SetCacheValue method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4797
2020-05-27 08:20:20 -04:00
Brad King 1174f45990 Merge topic 'automoc-after-generated-sources'
8f2702005a AutoMoc: Configure AutoMoc after generated sources (PCH, Unity)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4792
2020-05-27 08:19:31 -04:00
Brad King b12ac3ebc0 Merge topic 'test-RunCMake.install-LDFLAGS'
1c97a3c442 Tests: Fix RunCMake.install LDFLAGS treatment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4793
2020-05-27 08:18:41 -04:00
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 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 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 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
Raul Tambre 19cc5bc296 CUDA: Throw error if user-specified architectures don't work
Previously if an user specified CMAKE_CUDA_ARCHITECTURES and they didn't
work we would end up erroring during compiler testing.  Instead check if
the architectures we successfully compiled with are the same as the
user-specified (if any). If they don't match, then throw a more helpful
error than compiler testing would.

Additionally, to make this work correctly I made it try all
user-specified architectures at once instead of each separately.

Implements: #20756
2020-05-26 16:08:52 -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
Brad King 0b837ab371 cmState: Drop unused and unimplemented SetCacheValue method
Fixes: #20758
2020-05-26 12:54:49 -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