mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity
48,532 Commits 2 Branches 385 Tags
2e7cefec03e580ea09c5479247d8d1991618e5ab
Commit Graph

48532 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Boeckel
2e7cefec03 gitlab-ci: add a cuda10.2 builder 2020-06-12 09:13:21 -04:00
Ben Boeckel
1a2961b895 Tests: add CUDA labels to tests which are affected by CUDA 2020-06-11 13:04:33 -04:00
Ben Boeckel
2caa7502d5 ci: support running just a set of tests with external builders 2020-06-11 13:03:38 -04:00
Ben Boeckel
26b4cbcf93 gitlab-ci: move Makefiles Linux tests to use the package 2020-06-11 13:03:38 -04:00
Brad King
01fb8d7993 Merge topic 'nvcc_supports_cuda17' into release-3.18 
95700be52d CUDA: Teach CMake that NVCC 11 supports cuda_std_17

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4872
 2020-06-11 07:45:29 -04:00
Brad King
61ad9d92bd Merge topic 'FindProtobuf-typo' into release-3.18 
c1de3d1b34 FindProtobuf: Fix typo in documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4873
 2020-06-11 07:44:24 -04:00
Ron Klein
c1de3d1b34 FindProtobuf: Fix typo in documentation 
typo: "filess" ==> "files"
 2020-06-10 15:01:37 -04:00
Robert Maynard
95700be52d CUDA: Teach CMake that NVCC 11 supports cuda_std_17 2020-06-10 13:27:51 -04:00
Craig Scott
abe36194e8 Merge topic 'add-missing-test-args' into release-3.18 
131b8cc8ae Help/dev: document other arguments to `Do: test`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4870
 2020-06-10 08:42:39 -04:00
Ben Boeckel
131b8cc8ae Help/dev: document other arguments to Do: test 2020-06-09 11:12:05 -04:00
Brad King
596cfd2680 CMake 3.18.0-rc1 v3.18.0-rc1 2020-06-09 10:58:51 -04:00
Brad King
9ceb980981 Merge topic 'cmGeneratorTarget-include-cmProperty' into release-3.18 
e65e88fbce cmGeneratorTarget: fix misplaced header

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4864
 2020-06-09 09:25:54 -04:00
Brad King
577c86e59d Merge topic 'cpack-ifw-3.2' into release-3.18 
b79aad8069 CPack/IFW: Add Qt installer framework version 3.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4859
 2020-06-09 09:23:08 -04:00
Brad King
5bb24ed550 Merge topic 'FindOpenSSL-3.0' into release-3.18 
796b447373 FindOpenSSL: Fix OpenSSL 3.0.0 version extraction

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4860
 2020-06-09 08:53:05 -04:00
Craig Scott
b5d8e93732 Merge topic 'doc-gitlab-ci' into release-3.18 
855ed80111 Help/dev: Update CMake Review Process document for GitLab CI

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4865
 2020-06-09 07:59:45 -04:00
Brad King
855ed80111 Help/dev: Update CMake Review Process document for GitLab CI 
We have replaced use of `buildbot` with GitLab CI.  Update the
relevant section of our review process documentation.
 2020-06-09 07:54:22 -04:00
Craig Scott
bccede34aa Merge topic 'doc-testprop-DEPENDS-REQUIRED_FILES' into release-3.18 
6b75175219 Help: Add example for REQUIRED_FILES test property
61139c91d2 Help: Add example for DEPENDS test property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4853
 2020-06-09 05:55:24 -04:00
Michael Hirsch
6b75175219 Help: Add example for REQUIRED_FILES test property 2020-06-09 09:20:23 +10:00
Michael Hirsch
61139c91d2 Help: Add example for DEPENDS test property 2020-06-09 09:04:04 +10:00
Brad King
e8e1aefd33 Merge topic 'remove-unused-ci-script' into release-3.18 
f8b2d8f178 ci: remove unused sccache download script

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4866
 2020-06-08 13:08:43 -04:00
Ben Boeckel
f8b2d8f178 ci: remove unused sccache download script 2020-06-08 11:39:02 -04:00
Vitaly Stakhovsky
e65e88fbce cmGeneratorTarget: fix misplaced header 
In commit b36d1bdd9d (Single location for cmProp typedef, 2020-05-30)
we accidentally left inclusion of `cmProperty.h` out of the main
block of includes.
 2020-06-08 09:19:35 -04:00
Billy Brumley
796b447373 FindOpenSSL: Fix OpenSSL 3.0.0 version extraction 
Fix the regex syntax added by commit 61d746e592 (FindOpenSSL: Detect
OpenSSL 3.0.0, 2020-05-27, v3.17.3~1^2).  Add missing escapes.
Test with `openssl-3.0.0-alpha3`.

While at it, also unset a temporary variable after use.
 2020-06-08 08:24:57 -04:00
Frederik Gladhorn
b79aad8069 CPack/IFW: Add Qt installer framework version 3.2 
Qt 5.15 comes with IFW 3.2
 2020-06-08 08:11:39 -04:00
Brad King
d1f30ccab5 Merge topic 'cpack_typo' into release-3.18 
f859e6f812 CPack/IFW: Fix documentation typo: REQUARED

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4862
 2020-06-08 08:10:15 -04:00
Frederik Gladhorn
f859e6f812 CPack/IFW: Fix documentation typo: REQUARED 2020-06-08 08:08:58 -04:00
Brad King
019ff154b9 Merge topic 'vs-add_package_reference_install' into release-3.18 
3fd07d30bf VS: Enable DOTNET_TARGET_FRAMEWORK properties all target types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4854
 2020-06-08 08:03:04 -04:00
Brad King
45ecea430b Merge topic 'cuda_cudart_status' into release-3.18 
7e2f86461a FindCUDAToolkit: Fix cudart not found status message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4861
 2020-06-08 07:57:52 -04:00
Raul Tambre
7e2f86461a FindCUDAToolkit: Fix cudart not found status message 
This ended up after the searching after commit dc2eae1 (FindCUDAToolkit: Factor
out discovery code into a separate file, 2020-04-22).
Move it back to where it was and should be.
 2020-06-08 07:56:31 -04:00
Brad King
6f8a31849c Merge topic 'cuda_clang_simulate' into release-3.18 
0f88b7a592 CUDA: Fix Clang depfile flags when simulating MSVC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4863
 2020-06-08 07:55:51 -04:00
Raul Tambre
0f88b7a592 CUDA: Fix Clang depfile flags when simulating MSVC 
__compiler_clang() doesn't call __compiler_gnu() if we're emulating MSVC. Thus
CMAKE_DEPFILE_FLAGS_CUDA remains unset and compiling doesn't work, due to NVCC
dependency injection workaround in CMakeCUDAInformation.cmake, which triggers
for Ninja if they're not set.
Always set the depfile flags to fix this. Most other compiler modules seem to
do the same.
 2020-06-08 07:54:51 -04:00
Brad King
8325683420 Merge topic 'cuda_user_architectures_specifiers' into release-3.18 
4eaf1ef425 CUDA: Fix checking working architectures with specifiers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4856
 2020-06-08 07:53:26 -04:00
Brad King
01069f9a10 Merge topic 'cuda-arch-cmp0104' into release-3.18 
5bf9a290e7 CUDA: Fix CUDA_ARCHITECTURES policy CMP0104 check in try_compile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4857
 2020-06-05 11:01:15 -04:00
Brad King
5bf9a290e7 CUDA: Fix CUDA_ARCHITECTURES policy CMP0104 check in try_compile 
Since commit e98588aaba (CUDA: Add CUDA_ARCHITECTURES target property,
2020-03-12), `CMAKE_CUDA_ARCHITECTURES` is both initialized and required
by policy CMP0104's `NEW` behavior.  Inside a `try_compile` project we
use `cmake_minimum_required(VERSION ...)` with the current running
version of CMake.  Now that our version number is 3.18, `CMP0104` gets
set to `NEW` in the `try_compile`.  If the outer projects does not set
the policy then `CMAKE_CUDA_ARCHITECTURES` is not available and the
`try_compile` fails to generate.

Teach `try_compile` to check the outer project's policy status and
set policy CMP0104 to `OLD` if needed to match.

Fixes: #20794
 2020-06-05 10:09:33 -04:00
Brad King
7934352e44 Begin 3.18 release versioning 2020-06-05 08:33:59 -04:00
Brad King
47a47f5ce0 Help: Drop development topic notes to prepare release 
Release versions do not have the development topic section of
the CMake Release Notes index page.
 2020-06-05 08:33:59 -04:00
Brad King
7cf278da55 Merge topic 'doc-3.18-relnotes' 
389ca18289 Help: Organize and revise 3.18 release notes
ab6b5c01ea Help: Consolidate 3.18 release notes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4845
 2020-06-05 08:22:18 -04:00
Raul Tambre
4eaf1ef425 CUDA: Fix checking working architectures with specifiers 
We don't distinguish real/virtual architectures during compiler detection.
If the user passes -DCMAKE_CUDA_ARCHITECTURES="70-virtual" we'll test with only
the real architecture.
If it works "architectures" will end up as "70". We check equality using
strings, so this fails and we incorrectly throw an error.
Fix this by comparing against CMAKE_CUDA_ARCHITECTURES with the specifiers
stripped.

We need to deduplicate tested_architectures for the same reason in case the
user specified something like "70-real;70-virtual".
 2020-06-05 15:04:23 +03:00
Kinan Mahdi
3fd07d30bf VS: Enable DOTNET_TARGET_FRAMEWORK properties all target types 
This makes them compatible with `VS_PACKAGE_REFERENCES` and, in
particular, fixes nuget package references in combination with install
targets.

Fixes: #20764
 2020-06-05 08:01:59 -04:00
Brad King
3414ee155e Merge topic 'reduce-try_compile' 
9f3923893c libarchive: Map fixed-size integer types from KWIML as typedefs
d20bf471c8 liblzma: Map fixed-size integer types from KWIML as typedefs
92c4316d81 KWSys: Hard-code try_compile results on Windows
2bc89f1a03 cmSystemTools: Hard-code try_compile results for Windows
d350d4668a libarchive: Hard-code try_compile results for bundled dependencies
bf60ac24ae Source: Assume elf.h does not exist on Windows
f408cc2c40 expat: Remove unused try_compile checks
6c4f3dcd7b Utilities: Update hard-coded try_compile results for third-party libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4848
 2020-06-05 07:58:38 -04:00
Brad King
6aa8746810 Merge topic 'msbuild-utf8-enable' 
e219527a72 VS: Use StdOutEncoding for VS 16.7 Preview 3 and above
8a7ad923a8 VS: Extract instance version from VS Installer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4847
 2020-06-05 07:57:46 -04:00
Brad King
c3c41a9308 Merge topic 'armclang-mcpu/armlink--cpu_options' 
ef816610be ARMClang: allow fallback to -march and correct setting of --cpu flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4850
 2020-06-05 07:57:06 -04:00
Brad King
efac04465c Merge topic 'cuda_clang_separable_error' 
b1243201e7 CUDA: Don't RunCMake generate separable compilation tests on Clang
1b4c690543 CUDA: Throw error if CUDA_SEPARABLE_COMPILATION is ON when using Clang

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4827
 2020-06-05 07:56:19 -04:00
Kitware Robot
4af0458630 CMake Nightly Date Stamp 2020-06-05 00:01:10 -04:00
Kitware Robot
d0a44e0458 CMake Nightly Date Stamp 2020-06-04 00:01:13 -04:00
Brad King
cc746c5b7e Merge topic 'linux-release-builders' 
922cd3affe ci: fix the project detection for CDash submissions
c5b072800d gitlab-ci: add jobs for reproducing the release binaries
45f2786ff7 Release/linux: remove explicit LANG setting
c540fcaa6b Sphinx/create_identifiers: handle qhp contents as utf-8
e237fc65b7 Sphinx/create_identifiers: use `not in` not `not _ in`
0aa061f6f8 Sphinx/create_identifiers: remove unused import

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4852
 2020-06-03 15:20:05 -04:00
Brad King
005269a03f Merge topic 'gitlab-ci-msvc-14.26' 
f65ba96043 gitlab-ci: Update Windows builds to MSVC 19.26

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4851
 2020-06-03 14:10:50 -04:00
Ben Boeckel
922cd3affe ci: fix the project detection for CDash submissions 2020-06-03 13:02:16 -04:00
Ben Boeckel
c5b072800d gitlab-ci: add jobs for reproducing the release binaries 2020-06-03 12:50:15 -04:00
Brad King
f65ba96043 gitlab-ci: Update Windows builds to MSVC 19.26 2020-06-03 12:22:30 -04:00