mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-01 11:50:11 -05:00
Code Issues Packages Projects Releases Wiki Activity
50,308 Commits 2 Branches 401 Tags
9fa7afe7d332ced27264f1ef7c921aa1d95bc476
Commit Graph

50308 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Kyle Edwards 638557cbfe CMakePresets.json: Properly report macro expansion errors 
Make a distinction between strings which simply use the
$vendor{<...>} macro, which is valid but makes it unusable by CMake,
and strings which actually contain invalid macro expansions.

Fixes: #21308
 2020-10-21 09:20:52 -04:00
Kyle Edwards ec3b3d2c2f Merge topic 'cmakepresets-schema' into release-3.19 
21bc2fd945 CI: Install jsonschema for schema testing
e3bce8edf4 Tests: Add JSON schema validation to CMakePresets.json tests
0307f7c980 Help: Add JSON schema for CMakePresets.json

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5366
 2020-10-21 09:15:29 -04:00
Brad King e59c8f548d Merge topic 'ci-win-python' into release-3.19 
8f7fef629b ci: add Python to PATH on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5403
 2020-10-20 15:59:20 -04:00
Brad King 8f7fef629b ci: add Python to PATH on Windows 
Our test suite searches for a Python interpreter to perform some extra
checks.  Our CI base images for Linux have Python available.  Update our
Windows jobs to provide a Python interpreter for our test suite to find
consistently between the build and test steps.
 2020-10-20 15:11:12 -04:00
Kyle Edwards 21bc2fd945 CI: Install jsonschema for schema testing 2020-10-20 12:18:10 -04:00
Kyle Edwards e3bce8edf4 Tests: Add JSON schema validation to CMakePresets.json tests 2020-10-20 12:07:09 -04:00
Ben McMorran 0307f7c980 Help: Add JSON schema for CMakePresets.json 2020-10-20 12:07:09 -04:00
Kyle Edwards 81c88bb261 Merge topic 'cmake-presets-doc-move' into release-3.19 
4a123fc28c Help: Clarify purpose of warnings and errors
6c74bcfc20 Help: Make architecture and toolset descriptions generic
45766789a0 Help: Add inheritance to CMakePresets.json example
88c9d6f6eb Help: Add documentation for debug field
efab856008 Help: Show environment field
2208db114c Help: Show multiple ways of doing cacheVariables
d30f85193f Help: Move vendor field into example
b9c8c57860 Help: s/unusedVars/unusedCli/
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5373
 2020-10-20 11:59:54 -04:00
Brad King bb4e2f3f9a Merge topic 'find_package-check-dir' into release-3.19 
0356b81525 find_package: Fix regression in searching root prefix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5396
 2020-10-20 09:38:17 -04:00
Brad King 0356b81525 find_package: Fix regression in searching root prefix 
Fix the check added by commit 2ff1693066 (find_package: avoid showing
files as directories when searching config files, 2020-09-30,
v3.19.0-rc1~67^2) to avoid skipping the root prefix `/`.

Fixes: #21324
 2020-10-19 11:08:49 -04:00
Kyle Edwards 4a123fc28c Help: Clarify purpose of warnings and errors 2020-10-19 10:29:19 -04:00
Kyle Edwards 6c74bcfc20 Help: Make architecture and toolset descriptions generic 2020-10-19 10:29:19 -04:00
Kyle Edwards 45766789a0 Help: Add inheritance to CMakePresets.json example 2020-10-19 10:29:19 -04:00
Brad King e61d872839 Merge topic 'FindPython-support-version-3.10' into release-3.19 
23cd98a66a FindPython: Add support of version 3.10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5383
 2020-10-19 10:28:00 -04:00
Brad King f4e6dfe55d Merge topic 'separate_arguments-no-args' into release-3.19 
747f80fe82 separate_arguments: Fix crash on *_COMMAND with no arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5382
 2020-10-19 10:26:30 -04:00
Kyle Edwards 88c9d6f6eb Help: Add documentation for debug field 
Oops!
 2020-10-19 10:25:57 -04:00
Kyle Edwards efab856008 Help: Show environment field 2020-10-19 10:25:57 -04:00
Kyle Edwards 2208db114c Help: Show multiple ways of doing cacheVariables 
This demonstrates both the simple string and the complex object,
and ensures that they get automated testing.
 2020-10-19 10:25:57 -04:00
Kyle Edwards d30f85193f Help: Move vendor field into example 
This ensures that the vendor field gets automated testing from the
example.
 2020-10-19 10:25:57 -04:00
Kyle Edwards b9c8c57860 Help: s/unusedVars/unusedCli/ 
This was a mistake in the documentation.

Fixes: #21303
 2020-10-19 10:25:57 -04:00
Kyle Edwards c436aaaad1 Help: Move CMakePresets.json documentation into a separate file 2020-10-19 10:25:57 -04:00
Brad King ae1ca3034e Merge topic 'doc-CMP0111' into release-3.19 
5c3a91c808 CMP0111: Clarify that the new error is on a missing property setting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Reinking <alex_reinking@berkeley.edu>
Merge-request: !5385
 2020-10-19 10:23:50 -04:00
Brad King d3d292aa7b Merge topic 'sccache-macos-without-timeouts' into release-3.19 
b0fe666846 ci: use a patched sccache on macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5394
 2020-10-19 10:21:57 -04:00
Ben Boeckel b0fe666846 ci: use a patched sccache on macOS 
This version is much less likely to timeout on server startup since it
runs the expensive computation in a background thread.

See https://github.com/mozilla/sccache/pull/868 for the status.
 2020-10-19 09:23:06 -04:00
Craig Scott 792863ac29 Merge topic 'cmake-gui-disable-presets' into release-3.19 
d471406f0b CMake GUI: Disable preset fields instead of hiding them

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !5374
 2020-10-17 07:13:18 -04:00
Kyle Edwards d471406f0b CMake GUI: Disable preset fields instead of hiding them 2020-10-16 15:16:04 -04:00
Brad King e1d124286a Merge topic 'file-configure-angle-brackets' into release-3.19 
06a9a3bdc3 file(CONFIGURE): Allow angle brackets in content

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5379
 2020-10-16 09:23:42 -04:00
Brad King 0bdaa60e43 Merge topic 'CheckSource-Fortran' into release-3.19 
c4c636cef5 Tests: Add cases for CheckSource{Compiles,Runs} bad arguments
1e519df025 CheckSource{Runs,Compiles}: Fix default Fortran source extension

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5378
 2020-10-16 09:22:32 -04:00
Brad King 39b964272c Merge topic 'iar-obj-declutter' into release-3.19 
b357f78196 IAR: Use .o object file extension with IAR-Ilink toolchains

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5380
 2020-10-16 09:21:19 -04:00
Brad King a11ea1a9ee Merge topic 'fix-refactor-generator-configs' into release-3.19 
b9cb1d324d Fix regression in test/install/package configuration selection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5381
 2020-10-16 09:19:48 -04:00
Robert Bozzetto 747f80fe82 separate_arguments: Fix crash on *_COMMAND with no arguments 
Fixes: #21320
 2020-10-16 08:49:28 -04:00
Brad King 5c3a91c808 CMP0111: Clarify that the new error is on a missing property setting 
The previous wording could be confused with the file missing on disk.
 2020-10-16 08:26:00 -04:00