mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-19 06:18:40 -05:00
Code Issues Packages Projects Releases Wiki Activity
48,552 Commits 2 Branches 401 Tags
293d89ce0981bdb09065bc412330b672a1fdf598
Commit Graph

48552 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 293d89ce09 Merge topic 'android-windows-multi-config' 
d3d98288e2 Tests: Ensure that Android tests work for multi-config generators
be9633bc6e Tests: Append .exe suffix to objdump in Android test on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4858
 2020-06-09 09:23:50 -04:00
Brad King 7c8c28b5ca Merge branch 'release-3.18' 2020-06-09 09:23:08 -04:00
Brad King 3803f933bf Merge topic 'cpack-ifw-3.2' 
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 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 834cabeed6 Merge branch 'release-3.17' 2020-06-09 08:53:31 -04:00
Brad King 21483d9ea6 Merge branch 'release-3.18' 2020-06-09 08:53:06 -04:00
Brad King cc1592d708 Merge topic 'FindOpenSSL-3.0' 
796b447373 FindOpenSSL: Fix OpenSSL 3.0.0 version extraction

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4860
 2020-06-09 08:53:06 -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 675ddc4ccf Merge branch 'release-3.18' 2020-06-09 07:59:45 -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
Craig Scott 1f1af33e50 Merge topic 'doc-gitlab-ci' 
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
Craig Scott 8d093ea601 Merge branch 'release-3.18' 2020-06-09 05:55:24 -04:00
Craig Scott 0e3b72c2d2 Merge topic 'doc-testprop-DEPENDS-REQUIRED_FILES' 
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
Kitware Robot cfbd274f7c CMake Nightly Date Stamp 2020-06-09 00:01:29 -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
Brad King 0b575b52cb Merge branch 'release-3.18' 2020-06-08 13:08:43 -04:00
Brad King 6dd30508da Merge topic 'remove-unused-ci-script' 
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
Brad King 5a745cfbe0 Merge branch 'FindOpenSSL-3.0' into release-3.17 
Merge-request: !4860
 2020-06-08 08:25:59 -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 624a13046f Merge branch 'release-3.18' 2020-06-08 08:10:16 -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
Brad King 4301d0d7f0 Merge topic 'cpack_typo' 
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 8b99aeaea5 Merge branch 'release-3.18' 2020-06-08 08:03:04 -04:00
Brad King 24fe87d79f Merge topic 'vs-add_package_reference_install' 
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
Brad King 149eedf929 Merge branch 'release-3.18' 2020-06-08 07:57:52 -04:00
Brad King adf82af2c0 Merge topic 'cuda_cudart_status' 
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
Brad King 4070e6baf6 Merge branch 'release-3.18' 2020-06-08 07:55:51 -04:00
Brad King ce200b069f Merge topic 'cuda_clang_simulate' 
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 32cc81cc4d Merge branch 'release-3.18' 2020-06-08 07:53:27 -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 6a94ad1c36 Merge topic 'cuda_user_architectures_specifiers' 
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
Kitware Robot eec2e9b6b9 CMake Nightly Date Stamp 2020-06-08 00:01:05 -04:00
Kitware Robot 8ea392ebd6 CMake Nightly Date Stamp 2020-06-07 00:01:04 -04:00
Kitware Robot 742038e5a8 CMake Nightly Date Stamp 2020-06-06 00:01:18 -04:00
Kyle Edwards d3d98288e2 Tests: Ensure that Android tests work for multi-config generators 2020-06-05 14:24:28 -04:00
Kyle Edwards be9633bc6e Tests: Append .exe suffix to objdump in Android test on Windows 2020-06-05 14:24:28 -04:00
Brad King 268177d1e6 Merge branch 'release-3.18' 2020-06-05 11:01:16 -04:00
Brad King a4c23eb628 Merge topic 'cuda-arch-cmp0104' 
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:16 -04:00