mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-21 21:58:50 -05:00
Code Issues Packages Projects Releases Wiki Activity
50,506 Commits 2 Branches 401 Tags
910fc4d880426c0c0469eeaa26624e5989d02802
Commit Graph

50506 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot 910fc4d880 CMake Nightly Date Stamp 2020-10-28 00:01:08 -04:00
Brad King 024de8d137 Merge branch 'release-3.19' 2020-10-27 12:32:42 -04:00
Brad King 7aa404de94 Merge topic 'ci-config-sync' 
e68d3e3b44 ci: update to Qt 5.15.1
d759c4310d ci: update to use CMake 3.18.4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5433
 2020-10-27 12:32:42 -04:00
Brad King b79aadbfd4 Merge topic 'ci-config-sync' into release-3.19 
e68d3e3b44 ci: update to Qt 5.15.1
d759c4310d ci: update to use CMake 3.18.4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5433
 2020-10-27 12:32:42 -04:00
Ben Boeckel e68d3e3b44 ci: update to Qt 5.15.1 2020-10-27 09:49:07 -04:00
Ben Boeckel d759c4310d ci: update to use CMake 3.18.4 2020-10-27 09:48:56 -04:00
Brad King 1f6c2e9860 Merge branch 'release-3.18' into master 2020-10-27 08:22:00 -04:00
Brad King 73f9be3055 Merge branch 'release-3.19' 2020-10-27 08:20:55 -04:00
Brad King c300355aab Merge topic 'cuda_vs_skip_computation' 
dd77dec18d VS: Don't compute CUDA options unless necessary

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5422
 2020-10-27 08:20:55 -04:00
Brad King 8d6a0b9364 Merge topic 'cuda_vs_skip_computation' into release-3.19 
dd77dec18d VS: Don't compute CUDA options unless necessary
e9109dec36 Merge branch 'ninja-multi-per-config-sources' into release-3.18
7c0de4175b Merge branch 'cmake-E-cat-binary' into release-3.18

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5422
 2020-10-27 08:20:54 -04:00
Craig Scott dbb957a5dc Merge branch 'release-3.19' 2020-10-27 07:33:46 -04:00
Craig Scott 105ef112c9 Merge topic 'cmake-presets-path-arg' 
b7d7eca66d CMakePresets.json: Rework how --preset argument is handled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5416
 2020-10-27 07:33:46 -04:00
Craig Scott 698851cdb7 Merge topic 'cmake-presets-path-arg' into release-3.19 
b7d7eca66d CMakePresets.json: Rework how --preset argument is handled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5416
 2020-10-27 07:33:45 -04:00
Brad King 3969c86b51 Merge branch 'cuda_vs_skip_computation' into release-3.18 
Merge-request: !5422
 2020-10-27 07:32:37 -04:00
Raul Tambre dd77dec18d VS: Don't compute CUDA options unless necessary 
In the following scenario (with 3.18 policies):
1. A CXX target is created.
2. CUDA language is enabled.

CMake 3.18 introduced CMP0104, which requires CUDA_ARCHITECTURES to be
set.  Because the CXX target was created before CUDA was enabled it
wouldn't have it set.  The Visual Studio generator would however end up
computing CUDA compile options for the CXX target, which would result in
a fatal error due to the policy violation.

There doesn't seem to be a reason to do this for targets that don't
actually use the CUDA language, so we can skip and generate the CXX
target just fine.

Fixes: #21341
 2020-10-27 07:29:01 -04:00
Brad King c79e02c4c3 Merge topic 'cmake-20866' 
03ad0e61c1 configure_file: Add option for user defined permissions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5320
 2020-10-27 07:11:13 -04:00
Brad King ecab18bb7c Merge topic 'issue-21034' 
1a3d125de8 target_sources: Support custom targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5421
 2020-10-27 07:10:24 -04:00
Brad King 80e2163f82 Merge topic 'issue-19696' 
c75d68a2af genex: improve unit testing for $<TARGET_NAME_IF_EXISTS:...>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5420
 2020-10-27 07:09:20 -04:00
Brad King 96ea613f16 Merge topic 'correct_msvc_cuda_flag_warning' into release-3.19 
2b0d3c3524 CUDA: Use MSVC version to determine supported C++ standard levels

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5423
 2020-10-27 07:05:18 -04:00
Brad King 5da313e55e Merge branch 'release-3.19' 2020-10-27 07:05:18 -04:00
Brad King 6739e8560c Merge topic 'correct_msvc_cuda_flag_warning' 
2b0d3c3524 CUDA: Use MSVC version to determine supported C++ standard levels

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5423
 2020-10-27 07:05:18 -04:00
Brad King 37bbe11b06 Merge branch 'release-3.19' 2020-10-27 07:02:50 -04:00
Brad King 967fb42d47 Merge topic 'check-module-name-conflicts' 
d192918586 Modules: Do not implicitly add new functions via old Check Modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5424
 2020-10-27 07:02:50 -04:00
Brad King 479a9dfb69 Merge topic 'check-module-name-conflicts' into release-3.19 
d192918586 Modules: Do not implicitly add new functions via old Check Modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5424
 2020-10-27 07:02:49 -04:00
Brad King fad2bf83ae Merge branch 'release-3.18' into master 2020-10-27 07:00:59 -04:00
Brad King 374cca779b Merge topic 'ninja-multi-per-config-sources' into release-3.19 
b8937a992b Merge branch 'release' into ninja-multi-per-config-sources
d13bd6ec3d Ninja Multi-Config: Don't try to calculate dependencies for "all"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !5430
 2020-10-27 06:59:57 -04:00
Brad King 9d920d6695 Merge branch 'release-3.19' 2020-10-27 06:59:57 -04:00
Brad King 2a1da463e9 Merge topic 'ninja-multi-per-config-sources' 
b8937a992b Merge branch 'release' into ninja-multi-per-config-sources
d13bd6ec3d Ninja Multi-Config: Don't try to calculate dependencies for "all"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !5430
 2020-10-27 06:59:57 -04:00
Kitware Robot 9cadb345d9 CMake Nightly Date Stamp 2020-10-27 00:01:05 -04:00
Brad King e9109dec36 Merge branch 'ninja-multi-per-config-sources' into release-3.18 
Merge-request: !5430
 2020-10-26 16:14:00 -04:00
Kyle Edwards b8937a992b Merge branch 'release' into ninja-multi-per-config-sources 2020-10-26 15:43:57 -04:00
Kyle Edwards d13bd6ec3d Ninja Multi-Config: Don't try to calculate dependencies for "all" 2020-10-26 15:37:04 -04:00
Robert Maynard 2b0d3c3524 CUDA: Use MSVC version to determine supported C++ standard levels 
Fixes: #21335
 2020-10-26 11:36:55 -04:00
Robert Maynard d192918586 Modules: Do not implicitly add new functions via old Check Modules 
The conversion of Check<Lang>CompilerFlag, SourceCompiles, and
SourceRuns over to the new functions has the possibility of breaking
projects that had functions with those existing names.

To reduce the possibility of collisions we now have all the
legacy code call functions that start with `cmake_`, and users
will need to explicitly include the new modules to get the
non-prefixed versions

Fixes: #21359
 2020-10-26 10:57:55 -04:00
Brad King b3f1a29226 Merge topic 'doc-CMAKE_BUILD_TYPE' 
fb95d02252 Help: Document case insensitivity for CMAKE_BUILD_TYPE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5411
 2020-10-26 10:31:50 -04:00
Brad King d67f47109c Merge topic 'ExternalData-suppress-progress' 
ae7c81c622 ExternalData: add support for suppressing progress during the build

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5413
 2020-10-26 10:31:11 -04:00
Brad King 223eb0226e Merge topic 'android-find_path' 
a7f41a7ee4 Android: Fix find_* search order within NDK for unified toolchains
5cdf37e4cc Android: Root searches within the NDK for unified toolchains

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5357
 2020-10-26 10:30:12 -04:00
Brad King 0019e7e60c Merge branch 'release-3.19' 2020-10-26 10:29:23 -04:00
Brad King 388dc4d2ac Merge topic 'correct_profiling-output_exception' 
afac7482d2 cmake: command arguments which use '=' behave consistently

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5414
 2020-10-26 10:29:23 -04:00
Brad King 9fa7afe7d3 Merge topic 'correct_profiling-output_exception' into release-3.19 
afac7482d2 cmake: command arguments which use '=' behave consistently

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5414
 2020-10-26 10:29:22 -04:00
Brad King 9eec82f8c5 Merge branch 'release-3.19' 2020-10-26 10:28:30 -04:00
Brad King a1fe3be2bf Merge topic 'per-config-source-TARGET_FILE' into release-3.19 
cd33bfcad5 add_custom_command: Properly recognize if sources depend on config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5410
 2020-10-26 10:28:30 -04:00
Brad King f87360b781 Merge topic 'per-config-source-TARGET_FILE' 
cd33bfcad5 add_custom_command: Properly recognize if sources depend on config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5410
 2020-10-26 10:28:30 -04:00
Brad King 6335b67c80 Merge topic 'FindBoost-config-mode' into release-3.19 
4b2a61946f FindBoost: Honor BOOST_ROOT when finding upstream BoostConfig
b32cb33275 FindBoost: Honor Boost_NO_SYSTEM_PATHS when finding upstream BoostConfig

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5408
 2020-10-26 10:27:25 -04:00
Brad King 2270188662 Merge branch 'release-3.19' 2020-10-26 10:27:25 -04:00
Brad King 9a01da2cfb Merge topic 'FindBoost-config-mode' 
4b2a61946f FindBoost: Honor BOOST_ROOT when finding upstream BoostConfig
b32cb33275 FindBoost: Honor Boost_NO_SYSTEM_PATHS when finding upstream BoostConfig

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5408
 2020-10-26 10:27:25 -04:00
Kyle Edwards b7d7eca66d CMakePresets.json: Rework how --preset argument is handled 
If a path argument with no -S or -B leads to a cache directory,
use that directory as the binary directory. Otherwise, use the
binary directory from the preset.

Fixes: #21311
 2020-10-26 22:32:45 +11:00
Craig Scott 67a3865587 Merge branch 'release-3.19' 2020-10-26 07:16:03 -04:00
Craig Scott 394a5b71b0 Merge topic 'docs-cleanup-3.19' 
95c14579f2 Help: Cleanup typos and grammar for the 3.19 release

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5419
 2020-10-26 07:16:03 -04:00
Craig Scott 39fac5f476 Merge topic 'docs-cleanup-3.19' into release-3.19 
95c14579f2 Help: Cleanup typos and grammar for the 3.19 release

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5419
 2020-10-26 07:16:02 -04:00