mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 22:31:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
50,466 Commits 2 Branches 401 Tags
d67f47109c71503edfe5b9ff93333c9eff0b1f75
Commit Graph

50466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Kitware Robot d22a760cb9 CMake Nightly Date Stamp 2020-10-26 00:01:06 -04:00
Kitware Robot d749d46814 CMake Nightly Date Stamp 2020-10-25 00:01:04 -04:00
Craig Scott 95c14579f2 Help: Cleanup typos and grammar for the 3.19 release 2020-10-24 22:58:42 +11:00
Kitware Robot a8e9208f70 CMake Nightly Date Stamp 2020-10-24 00:01:19 -04:00
Ben Boeckel ae7c81c622 ExternalData: add support for suppressing progress during the build 
During CI builds (at least), download progress is just noise. Allow it
to be suppressed.

Default to `OFF` for Ninja due to the tool's behavior of not showing
output until a command is complete (which makes any progress reporting
of little use) and `ON` otherwise.
 2020-10-23 09:49:51 -04:00
Haibo Huang a7f41a7ee4 Android: Fix find_* search order within NDK for unified toolchains 2020-10-23 09:36:48 -04:00
Haibo Huang 5cdf37e4cc Android: Root searches within the NDK for unified toolchains 
Set `CMAKE_FIND_ROOT_PATH_MODE_*` appropriately.
 2020-10-23 09:36:40 -04: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 5988a4deea Merge topic 'no-override-flow-control' 
8aee7fdb32 cmState: Prohibit override of flow control commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5409
 2020-10-23 09:06:03 -04:00
Brad King 31848e35a7 Merge topic 'proper-command-nesting' 
12f6e37eb7 cmListFileCache: Enforce proper nesting of flow control statements
67383725bd cm::optional: Add constructor delegation to nullopt_t constructor
0668120398 cm::optional: Fix move assignment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5401
 2020-10-23 09:05:13 -04:00
Brad King b91dd2c639 Merge topic 'ctest-hostname-cleanup' 
11d21c1c4e CTest: Avoid invoking external tool to get the host name
3f3762856f Tests: Add case verifying CTest module SITE variable
94c6295db1 Help: Document site_name command use of HOSTNAME variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5407
 2020-10-23 09:02:37 -04:00
Brad King a541921c56 Merge topic 'FindGTest-config-mode' 
2327b4330c FindGTest: Added support for CONFIG mode
6d45f951ed FindGTest: Minor whitespace change, moved an include upwards
98d5f033ed FindGTest: Ensure target names follow upstream GTest
585cc7c930 ci: install gmock in the Fedora 31 image

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5404
 2020-10-23 09:01:00 -04:00
Brad King d11338dba1 Merge branch 'release-3.19' 2020-10-23 08:44:48 -04:00
Brad King bc0c72f1f0 Merge topic 'vs-fortran-debugging-flags' 
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:48 -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 e4b92b4378 Merge branch 'release-3.19' 2020-10-23 06:37:57 -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 dbd1d737f9 Merge topic 'cmake-presets-toolset-arch-config' 
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 3bc4dc07e9 Merge branch 'release-3.19' 2020-10-23 06:36:04 -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
Craig Scott 5d20e6d803 Merge topic 'cmake-presets-source-dir-name' 
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
Kitware Robot 6d306a42da CMake Nightly Date Stamp 2020-10-23 00:01:14 -04:00
Kyle Edwards 8aee7fdb32 cmState: Prohibit override of flow control commands 2020-10-22 17:04:31 -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 3a82ff6a11 Merge topic 'cmake-16773' 
3c324689a7 include: refactor call sites of cmMakefile::ReadDependentFile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5405
 2020-10-22 12:00:39 -04:00
Kyle Edwards 12f6e37eb7 cmListFileCache: Enforce proper nesting of flow control statements 
Fixes: #19153
 2020-10-22 11:40:48 -04:00
Kyle Edwards 67383725bd cm::optional: Add constructor delegation to nullopt_t constructor 
Some static analysis tools incorrectly identify this constructor
as leaving _has_value in an undefined state. Explicitly call the
default constructor to force _has_value to false.
 2020-10-22 11:40:48 -04: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 34990a9e3d Merge branch 'release-3.19' 2020-10-22 11:05:09 -04:00
Kyle Edwards 5ef9978087 Merge topic 'cmake-presets-invalid-macro' 
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 3e74f89e3f Merge branch 'release-3.19' 2020-10-22 11:04:19 -04:00
Kyle Edwards 6abe14d226 Merge topic 'cmake-presets-boolean-cache' 
920d180047 CMakePresets.json: Allow boolean for cache variable value

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5398
 2020-10-22 11:04:19 -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 11d21c1c4e CTest: Avoid invoking external tool to get the host name 
Populate the SITE cache entry using an internal query instead.
 2020-10-22 10:49:17 -04:00