mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-16 04:02:03 -06:00
Code Issues Packages Projects Releases Wiki Activity
48,430 Commits 2 Branches 390 Tags
e76c11aa7c68abdfe60d1ad9c3df05ea06ef1755
Commit Graph

48430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
e76c11aa7c Merge branch 'backport-3.17-pch-no-Fortran' into pch-no-Fortran 2020-06-02 08:24:11 -04:00
Brad King
10c88c4337 PCH: Do not enable GNU or Intel PCH settings for Fortran 
The PCH settings are shared by C and CXX languages but do not make sense
for Fortran.  In particular, `CMAKE_PCH_EXTENSION` should not be set
because it can overwrite the value set for C/C++ languages, which may
have a different compiler vendor than the Fortran compiler.

Fixes: #20752
 2020-06-02 08:23:40 -04:00
Brad King
a432b1075c Merge topic 'getdef-expand' 
7ed8c9ebe3 cmMakefile: add GetDefExpandList() that splits value into std::vector

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4819
 2020-06-02 08:02:24 -04:00
Brad King
ec7b5f21ee Merge topic 'doc-c-standard' 
e8958d4742 Help: Clarify that no version of MSVC today support C standard levels

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4830
 2020-06-02 08:01:40 -04:00
Brad King
fff14290d2 Merge topic 'cmprop' 
b36d1bdd9d Single location for cmProp typedef

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4829
 2020-06-02 08:00:55 -04:00
Brad King
75a34b1214 Merge topic 'UseSWIG-note-dep-strategy' 
1f543b23a8 UseSWIG: note dependency behavior for Make generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4834
 2020-06-02 08:00:07 -04:00
Brad King
a0c4c27443 Merge topic 'macos-sdk-libraries' 
444dbd40de Darwin: honour `CMAKE_OSX_SYSROOT` more faithfully

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4779
 2020-06-02 07:57:07 -04:00
Brad King
855a7158ed Merge topic 'target_link_libraries-self-link-is-an-error' 
9436ad35df target_link_libraries: self-link through ALIAS is an error

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4826
 2020-06-02 07:53:40 -04:00
Brad King
1b0b0c6427 Merge topic 'getdef-nodups' 
1e805f53f5 GetDefinition: avoid duplicate calls

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4824
 2020-06-02 07:52:14 -04:00
Brad King
6950706ca0 Merge topic 'asm-preprocessor-flag' 
97fa63c09b ASM: Fix preprocessor definition flags for GNU 'as' tool

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4838
 2020-06-02 06:39:44 -04:00
Brad King
241dde8de0 Merge topic 'test-fs-time-resolution' 
37bf7eb7a6 Tests: Skip RunCMake.try_compile RerunCMake-nowork case on 1s filesystems

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4816
 2020-06-02 06:29:12 -04:00
Kitware Robot
06f9be47b8 CMake Nightly Date Stamp 2020-06-02 00:01:19 -04:00
Kyle Edwards
97fa63c09b ASM: Fix preprocessor definition flags for GNU 'as' tool 
Fixes: #20780
 2020-06-01 14:43:37 -04:00
Brad King
37bf7eb7a6 Tests: Skip RunCMake.try_compile RerunCMake-nowork case on 1s filesystems 
On low-resolution filesystems, `Makefile` can end up with the same
time stamp as `CMakeCache.txt`.  CMake must re-run in this case to
be conservative, but that invalidates the `-nowork` cases.

Rather than trying to detect 1s filesystems, just add an option
called `CMake_TEST_FILESYSTEM_1S` that external scripts can use
to tell CMake's test suite about this.
 2020-06-01 13:42:16 -04:00
Hong Xu
e8958d4742 Help: Clarify that no version of MSVC today support C standard levels 
The current description sounds as if MSVC later than 2015 update 3
support C standard level, which is not true. This patch clarifies MSVC
support.
 2020-06-01 10:51:34 -04:00
Ben Boeckel
1f543b23a8 UseSWIG: note dependency behavior for Make generators 
See: #20067
 2020-06-01 10:09:56 -04:00
Brad King
1d2c8ae209 Merge branch 'release-3.17' 2020-06-01 09:31:51 -04:00
Brad King
20ca1c018f Merge branch 'release-3.16' into release-3.17 2020-06-01 09:31:13 -04:00
Brad King
066e2fa82c Merge branch 'release-3.16' 2020-06-01 09:02:34 -04:00
Vitaly Stakhovsky
b36d1bdd9d Single location for cmProp typedef 2020-06-01 08:54:20 -04:00
Brad King
39c6ac5112 CMake 3.16.8 v3.16.8 2020-06-01 07:56:25 -04:00
Brad King
6f5f87966b Merge topic 'fc-ep-git-update-strategy' 
8aa4d51ec5 ExternalProject: Add missing release note for git update strategy
1236590507 FetchContent: Pass through CMAKE_EP_GIT_REMOTE_UPDATE_STRATEGY if set
e71c2807ba ExternalProject: Remote checkout needs to include the remote name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4818
 2020-06-01 07:49:14 -04:00
Brad King
e773892ccb Merge topic 'non-coverage-lines' 
ed6d20ddcb CTest: Handle non-coverage lines in gcov files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4822
 2020-06-01 07:48:25 -04:00
Brad King
5dfb4dc2d1 Merge topic 'cuda_user_architectures_nvcc' 
650c1029a0 CUDA: Detect non-working user-specified architectures on NVCC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4814
 2020-06-01 07:47:30 -04:00
Brad King
43238877d4 Merge branch 'release-3.16' 2020-06-01 07:45:37 -04:00
Brad King
6a9441058e Merge branch 'release-3.17' 2020-06-01 07:44:35 -04:00
Brad King
3020decbff Merge topic 'pch-fix-bad-ClearSourcesCache' 
902858367f Merge branch 'backport-3.16-pch-fix-bad-ClearSourcesCache'
fa7b041eca PCH: Fix logic error that incorrectly clears sources during VS generation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4815
 2020-06-01 07:44:35 -04:00
Brad King
f671372735 Merge topic 'pch-fix-bad-ClearSourcesCache' into release-3.17 
902858367f Merge branch 'backport-3.16-pch-fix-bad-ClearSourcesCache'
fa7b041eca PCH: Fix logic error that incorrectly clears sources during VS generation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4815
 2020-06-01 07:44:34 -04:00
Brad King
b763a5e325 Merge branch 'release-3.17' 2020-06-01 07:36:50 -04:00
Brad King
8cf2e1de22 Merge topic 'ninja-multi-export-all-symbols' 
6fc4bfa11c Ninja Multi-Config: Fix bug in CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Reinking <alex_reinking@berkeley.edu>
Merge-request: !4825
 2020-06-01 07:36:50 -04:00
Brad King
70b8a2863f Merge topic 'ninja-multi-export-all-symbols' into release-3.17 
6fc4bfa11c Ninja Multi-Config: Fix bug in CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Reinking <alex_reinking@berkeley.edu>
Merge-request: !4825
 2020-06-01 07:36:49 -04:00
Kitware Robot
14e25d991b CMake Nightly Date Stamp 2020-06-01 00:01:14 -04:00
Kitware Robot
6e7230f7dd CMake Nightly Date Stamp 2020-05-31 00:01:13 -04:00
Saleem Abdulrasool
444dbd40de Darwin: honour CMAKE_OSX_SYSROOT more faithfully 
The libraries in the SDK should be given precedence over the system
libraries.  Check for the default library search path (in default order)
of `/usr/lib` and `/usr/local/lib` and use these as system prefix paths
for libraries when performing the link step against a specified SDK.
 2020-05-30 20:32:38 -07:00
Vitaly Stakhovsky
7ed8c9ebe3 cmMakefile: add GetDefExpandList() that splits value into std::vector 
Combines cmMakefile:GetDefinition() and cmExpandList()
 2020-05-30 08:59:20 -04:00
Marc Chevrier
9436ad35df target_link_libraries: self-link through ALIAS is an error 
Fixes: #19617
 2020-05-30 11:47:39 +02:00
Kitware Robot
67dd687657 CMake Nightly Date Stamp 2020-05-30 00:01:21 -04:00
Kyle Edwards
6fc4bfa11c Ninja Multi-Config: Fix bug in CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS 
Fixes: #20775
 2020-05-29 15:28:43 -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
Vitaly Stakhovsky
1e805f53f5 GetDefinition: avoid duplicate calls 2020-05-29 13:12:22 -04:00
Craig Scott
8aa4d51ec5 ExternalProject: Add missing release note for git update strategy 
This release note was mistakenly omitted from commit 0aea435aa1
(ExternalProject: Provide choice of git update strategies, 2020-02-12).
 2020-05-29 12:10:33 -04:00
Craig Scott
1236590507 FetchContent: Pass through CMAKE_EP_GIT_REMOTE_UPDATE_STRATEGY if set 
This was missed when the initial support was added in
commit 0aea435aa1 (ExternalProject: Provide choice of
git update strategies, 2020-02-12)
 2020-05-29 12:10:32 -04:00
Craig Scott
e71c2807ba ExternalProject: Remote checkout needs to include the remote name 
Commit 0aea435aa1 (ExternalProject: Provide choice of
git update strategies, 2020-02-12) added the git update
strategies, but the CHECKOUT strategy was not handling
remote refs correctly. The local ref would be checked out
instead and no warning or error would have been emitted.
The test that should have caught this was also malformed
and did not actually move the local master branch as intended.
 2020-05-29 12:10:32 -04:00
Raul Tambre
650c1029a0 CUDA: Detect non-working user-specified architectures on NVCC 
Extend the improved error message added for Clang by commit 19cc5bc296
(CUDA: Throw error if user-specified architectures don't work,
2020-05-26) to cover NVCC as well.

Also fix the error incorrectly being thrown if the user-specified list
differed in order to the architectures parsed from the compiler output.

Implements: #20757
 2020-05-29 11:55:47 -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
Tobias Ellinghaus
ed6d20ddcb CTest: Handle non-coverage lines in gcov files 
This implements a TODO in gcov file handling.
 2020-05-29 16:08:47 +02: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