mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 04:40:56 -06:00
Code Issues Packages Projects Releases Wiki Activity
48,385 Commits 2 Branches 385 Tags
b36d1bdd9d235af24af401b671ebfa6e8d65e771
Commit Graph

48385 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vitaly Stakhovsky
b36d1bdd9d Single location for cmProp typedef 2020-06-01 08:54:20 -04:00
Kitware Robot
67dd687657 CMake Nightly Date Stamp 2020-05-30 00:01:21 -04:00
Brad King
6bb20b51c9 Merge topic 'gitlab-ci-concurrency-tags' 
0eebd0a0e3 gitlab-ci: pin macOS and Windows jobs to nonconcurrent runners

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4823
 2020-05-29 13:36:06 -04:00
Brad King
0eebd0a0e3 gitlab-ci: pin macOS and Windows jobs to nonconcurrent runners 
On macOS and Windows, our jobs use a `GIT_CLONE_PATH` that does not
contain `$CI_CONCURRENCY_ID` so that the build and test jobs always use
the same path.  Since we use shell runners for these platforms, all
concurrent jobs would use the same path and conflict.  Therefore we can
only use runners with a concurrency level of 1 for jobs in the `build`
and `test` stages.  However, jobs in the `test-ext` stage configure a
new build tree for the tests and therefore can use `$CI_CONCURRENCY_ID`
and support shell runners with higher concurrency levels.

Prepare to make that distinction in the future by pinning all jobs to
runners with a `nonconcurrent` tag.
 2020-05-29 11:23:16 -04:00
Brad King
1336d11d9c Merge topic 'gitlab-ci-xcode-11.5' 
0508a80c1a gitlab-ci: update macOS jobs to Xcode 11.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4821
 2020-05-29 10:25:02 -04:00
Brad King
0508a80c1a gitlab-ci: update macOS jobs to Xcode 11.5 2020-05-29 09:52:48 -04:00
Brad King
9656a0f55a Merge topic 'gitlab-ci-toolsets' 
0d5a1fd6e2 gitlab-ci: pin windows and macos jobs to runners with matching toolsets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4817
 2020-05-29 09:03:06 -04:00
Brad King
50c438b23e Merge topic 'msbuild-utf8-disable' 
5058fb5401 VS: Drop StdOutEncoding with VS 16.6 pending investigation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4820
 2020-05-29 09:01:45 -04:00
Brad King
5058fb5401 VS: Drop StdOutEncoding with VS 16.6 pending investigation 
The `StdOutEncoding` added to `.vcxproj` files since commit bc877a7e94
(Add support to indicate UTF-8 custom command pipe output encoding,
2020-04-08) breaks custom commands with symbolic outputs on VS 16.6.0.
Disable it pending further investigation and possibly a fix in VS.

Issue: #20769
 2020-05-29 08:24:14 -04:00
Brad King
0d5a1fd6e2 gitlab-ci: pin windows and macos jobs to runners with matching toolsets 
The toolsets available on machines hosting shell runners will evolve
over time.  Require the runners to have tags indicating that they have
specific toolsets available.  When toolsets are eventually removed from
a runner, its tags can then be updated accordingly to prevent pipelines
created for old commits from ever running on them.
 2020-05-29 07:15:16 -04:00
Brad King
25b63e06a1 Merge topic 'alias-cannot-overwrite-another-target' 
1eca5993e2 ALIAS target: cannot overwrite an existing target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4810
 2020-05-29 07:14:25 -04:00
Brad King
ce7570e21a Merge topic 'bugfix-gcev' 
d606b19f7d server-mode: Fix regression in cache entry reporting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4808
 2020-05-29 07:13:22 -04:00
Brad King
6f572c6b81 Merge branch 'release-3.17' 2020-05-29 07:11:58 -04:00
Brad King
b8fe888c12 Merge topic 'FindSubversion-xcode-removed' 
2c0db404d1 FindSubversion: Do not accept macOS stub without Xcode implementation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4813
 2020-05-29 07:11:58 -04:00
Brad King
1e4aaa31dd Merge topic 'FindSubversion-xcode-removed' into release-3.17 
2c0db404d1 FindSubversion: Do not accept macOS stub without Xcode implementation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4813
 2020-05-29 07:11:57 -04:00
Kitware Robot
da87557024 CMake Nightly Date Stamp 2020-05-29 00:01:19 -04:00
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
2c0db404d1 FindSubversion: Do not accept macOS stub without Xcode implementation 
Xcode no longer provides a `svn` implementation, but the `/usr/bin/svn`
stub may still exist.
 2020-05-28 11:37:47 -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
Vitaly Stakhovsky
d606b19f7d server-mode: Fix regression in cache entry reporting 
Refactoring in commit 0bf0e35e59 (cmCacheManager::GetProperty: return
cmProp, 2020-03-19) changed the return type of GetCacheEntryValue.
Update the server mode's call site accordingly.
 2020-05-28 06:46:10 -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