mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-25 07:38:33 -05:00
Code Issues Packages Projects Releases Wiki Activity
50,341 Commits 2 Branches 401 Tags
b77dfa441f444c63e6eb0274c88a47540a7a0816
Commit Graph

50341 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Scott b77dfa441f Help: Clarify variables specifying scripts to execute during packaging 
Relates: #19077
 2020-11-03 20:11:38 +11:00
Brad King 013c4133f7 Merge topic 'CheckSourceRuns-compatibility' into release-3.19 
a524bf3aa7 CheckSourceRuns: do not fail on unrecognized arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5426
 2020-10-30 09:51:35 -04:00
Craig Scott 604fa62c01 Merge topic 'string-json-doc-update' into release-3.19 
49fce3373b Help: Clarify string(JSON) error handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5427
 2020-10-30 07:15:40 -04:00
Ben Boeckel a524bf3aa7 CheckSourceRuns: do not fail on unrecognized arguments 
The old `check_X_source_runs` modules did not verify the arguments, so
we cannot start doing it now. Downgrade the hard error introduced in
commit 357e2ef429 (CheckSoureRuns: Add a unified way to check if a
source runs, 2020-09-14) via !5223 into a noisy warning.
 2020-10-28 15:06:02 -04:00
Peter Steneteg 49fce3373b Help: Clarify string(JSON) error handling 
Closes: #21355
 2020-10-28 23:09:24 +11:00
Brad King f506cc6bb2 CMake 3.19.0-rc2 v3.19.0-rc2 2020-10-28 08:03:20 -04:00
Brad King 199247c21a Merge topic 'cmake-presets-help-flag' into release-3.19 
c619be2784 ccmake: Don't list --preset in --help

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5428
 2020-10-28 07:47:37 -04:00
Brad King f48e32178f Merge topic 'cmake_path-update-doc' into release-3.19 
ec5951e078 cmake_path: Enhance documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5425
 2020-10-28 07:43:37 -04:00
Brad King fe310851a8 Merge topic 'cmake-gui-manual-argument' into release-3.19 
ef03124237 CMake GUI: Add --browse-manual argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5417
 2020-10-28 07:37:07 -04:00
Brad King 1a5c95e828 Merge topic 'FindRuby-restore-VENDORLIB_DIR' into release-3.19 
80e693152c Merge branch 'release-3.19' into FindRuby-restore-VENDORLIB_DIR
4c0ef57e8c FindRuby: Restore compatibility variable RUBY_VENDORLIB_DIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5434
 2020-10-28 07:27:49 -04:00
Brad King 15caa11da5 Merge topic 'xcode-fix-source-linking' into release-3.19 
5dc23300b1 Xcode: Fix regression that automatically links libraries in source list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5432
 2020-10-28 07:26:46 -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
Brad King 80e693152c Merge branch 'release-3.19' into FindRuby-restore-VENDORLIB_DIR 2020-10-27 12:25:41 -04:00
Brad King 4c0ef57e8c FindRuby: Restore compatibility variable RUBY_VENDORLIB_DIR 
Since commit e672db628b (FindRuby: Rename variables to match case of
module name, 2020-03-11, v3.18.0-rc1~546^2), the result variables named
with the old `RUBY_` prefix are provided by compatibility code that maps
from the new `Ruby_` prefix variables.  This variable was accidentally
left out.

Fixes: #21369
 2020-10-27 12:18:05 -04:00
Kyle Edwards ef03124237 CMake GUI: Add --browse-manual argument 2020-10-27 12:05:41 -04:00
Kyle Edwards c619be2784 ccmake: Don't list --preset in --help 
And show available options in cmake-gui.

Fixes: #21313
 2020-10-27 10:29:24 -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 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 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
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
Gusts Kaksis 5dc23300b1 Xcode: Fix regression that automatically links libraries in source list 
In commit e637744c51 (Xcode: Use "Link Binary With Libraries" to link
any library, 2019-07-10, v3.19.0-rc1~494^2~1) we accidentally added all
the library type files to "Link Binary With Libraries" build phase if
they were passed in as source files.  Revert that change as any actually
linked libraries will be added to that build phase later in the
`AddDependAndLinkInformation` call.

Fixes: #21361
 2020-10-27 07:12:26 -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 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 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 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 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 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 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
Marc Chevrier ec5951e078 cmake_path: Enhance documentation 2020-10-26 13:10:37 +01: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 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
Craig Scott 95c14579f2 Help: Cleanup typos and grammar for the 3.19 release 2020-10-24 22:58:42 +11:00
Robert Maynard afac7482d2 cmake: command arguments which use '=' behave consistently 
Fixes: #21351

The `profiling-format`, `profiling-output`, and `preset` all would
crash when invoked without a trailing `=`.
 2020-10-23 09:12:43 -04:00
Brad King f2a59d400e Merge topic 'vs-fortran-debugging-flags' into release-3.19 
8ad6fabfc5 VS: Remove flag table entries for Fortran /Z* flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5406
 2020-10-23 08:44:47 -04:00
Craig Scott 5e1858c0c2 Merge topic 'cmake-presets-toolset-arch-config' into release-3.19 
64afabdbcb CMakePresets.json: Split cmakeGeneratorConfig field

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5387
 2020-10-23 06:37:56 -04:00
Craig Scott 761dc324e0 Merge topic 'cmake-presets-source-dir-name' into release-3.19 
25742c589c CMakePresets.json: Add ${sourceDirName} macro

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !5386
 2020-10-23 06:36:03 -04:00
Deniz Bahadir cd33bfcad5 add_custom_command: Properly recognize if sources depend on config 
Fixes: #21349
 2020-10-22 23:03:05 +02:00
Kyle Edwards 64afabdbcb CMakePresets.json: Split cmakeGeneratorConfig field 
Make this field separate for both architecture and toolset. Allow
architecture and toolset to be either strings or objects with value
and strategy fields.

Fixes: #21317
 2020-10-22 11:24:39 -04:00
Kyle Edwards 25742c589c CMakePresets.json: Add ${sourceDirName} macro 
Fixes: #21312
 2020-10-22 11:09:28 -04:00
Kyle Edwards 609122007d Merge topic 'cmake-presets-invalid-macro' into release-3.19 
638557cbfe CMakePresets.json: Properly report macro expansion errors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5397
 2020-10-22 11:05:09 -04:00
Kyle Edwards 6af1185bb4 Merge topic 'cmake-presets-boolean-cache' into release-3.19 
920d180047 CMakePresets.json: Allow boolean for cache variable value

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5398
 2020-10-22 11:04:18 -04:00
Brad King 4b2a61946f FindBoost: Honor BOOST_ROOT when finding upstream BoostConfig 
Fixes: #21200
 2020-10-22 10:42:33 -04:00
Brad King b32cb33275 FindBoost: Honor Boost_NO_SYSTEM_PATHS when finding upstream BoostConfig 
Issue: #21200
 2020-10-22 10:42:33 -04:00
Volker Jacht 8ad6fabfc5 VS: Remove flag table entries for Fortran /Z* flags 
These were included when the Fortran flag table was first created by
commit 10c91ded4f (ENH: add support for Intel Fortran Visual studio IDE,
2008-04-30, v2.8.0~2227), but they map to fields not actually supported
by the IDE.  Remove their table entries.

Instead use just `/debug:minimal` and `/debug:full` to control debug
information level in VS Intel Fortran.  Let flags like `/Z7` pass
through as raw additional options because they have no corresponding IDE
property and can be used to complement the supported options.

Fixes: #21340
 2020-10-22 09:08:52 -04:00
Kyle Edwards 920d180047 CMakePresets.json: Allow boolean for cache variable value 
Fixes: #21327
 2020-10-21 10:37:08 -04:00