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

50271 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Felipe Torrezan b357f78196 IAR: Use .o object file extension with IAR-Ilink toolchains 
The compiler default extension for its objects is `.o`.
Prefer that over `.obj`.
 2020-10-15 11:49:39 -04:00
Brad King b9cb1d324d Fix regression in test/install/package configuration selection 
In commit 7a969fe21d (cmMakefile: Refactor API to better handle empty
config values, 2020-06-30, v3.19.0-rc1~567^2), calls to
`GetGeneratorConfigs` that pass `OnlyMultiConfig` only want to get any
configurations listed if the generator is multi-config.  Fix the
implementation to actually do that.

Fixes: #21316
 2020-10-15 10:53:09 -04:00
Brad King c4c636cef5 Tests: Add cases for CheckSource{Compiles,Runs} bad arguments 2020-10-15 09:42:56 -04:00
Cristian Adam 06a9a3bdc3 file(CONFIGURE): Allow angle brackets in content 
Fixes: #21306
 2020-10-15 15:42:21 +02:00
Michael Hirsch 1e519df025 CheckSource{Runs,Compiles}: Fix default Fortran source extension 
In commit 357e2ef429 (CheckSoureRuns: Add a unified way to check if a
source runs, 2020-09-14, v3.19.0-rc1~118^2), the default Fortran source
file extension was accidentally changed from `.F90` to `.F`.  Fix that.

In commit 10ae907de0 (CheckSoureCompiles: Add a unified way to check if
a source compiles, 2020-09-14, v3.19.0-rc1~118^2~1), the default Fortran
source extension was correctly preserved as `.F`, but `.F90` is a better
default both for consistency and modern usage.  Use that for direct
calls to the `check_source_compiles` macro.  Update our original
`check_fortran_source_compiles` implementation to use `.F` by default
as it did before.

Fixes: #21307
 2020-10-15 09:33:59 -04:00
Brad King b1d9a25f35 Merge topic 'cmake-E-cat-binary' into release-3.19 
f7a5f28318 cmake: Fix '-E cat' command for binary files on Windows
90b39a5209 cmConsoleBuf: Factor out cout/cerr console buffer management
f1fdd15863 clang-format: Fix include block order in ctest.cxx and cpack.cxx

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5364
 2020-10-15 08:10:50 -04:00
Brad King 30643e21d4 Merge topic 'bootstrap-make-smake' into release-3.19 
8e7ece1416 bootstrap: add smake as known make processors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5372
 2020-10-14 15:45:09 -04:00
Brad King a532268eef Merge topic 'bootstrap-ninja-samu' into release-3.19 
f0ac977d3c bootstrap: add samu as known ninja processors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5371
 2020-10-14 15:44:21 -04:00
Issam E. Maghni 8e7ece1416 bootstrap: add smake as known make processors 
As found in “Modules/CMakeUnixFindMake.cmake”
 2020-10-14 15:29:25 -04:00
Issam E. Maghni f0ac977d3c bootstrap: add samu as known ninja processors 
As found in “Modules/CMakeNinjaFindMake.cmake”
 2020-10-14 15:28:50 -04:00
Johnny Jazeix f7a5f28318 cmake: Fix '-E cat' command for binary files on Windows 
Reset `std::cout` to write in binary mode with no encoding conversions.

Co-Author: Brad King <brad.king@kitware.com>
Fixes: #21295
 2020-10-14 12:08:07 -04:00
Brad King 90b39a5209 cmConsoleBuf: Factor out cout/cerr console buffer management 2020-10-14 12:08:06 -04:00
Brad King f1fdd15863 clang-format: Fix include block order in ctest.cxx and cpack.cxx 2020-10-14 12:06:50 -04:00
Brad King 1356230b07 Merge topic 'cmake-gui-res' into release-3.19 
440ee739c4 cmake-gui: Attach icons only to main GUI executables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5368
 2020-10-14 10:51:32 -04:00
Kyle Edwards ad17001931 Merge topic 'cmake-help-fix' into release-3.19 
7d811ceb3a Help: Fix invalid code-block in cmake(1) manual

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5369
 2020-10-14 10:09:06 -04:00
Kyle Edwards 7d811ceb3a Help: Fix invalid code-block in cmake(1) manual 
Fixes: #21304
 2020-10-14 09:47:28 -04:00
Brad King 440ee739c4 cmake-gui: Attach icons only to main GUI executables 
In commit efe48189bf (cmake-gui: Restore application icon on macOS,
2020-10-13, v3.19.0-rc1~2^2) and commit f7ae4f572b (cmake-gui: Restore
application icon on Windows, 2020-10-13, v3.19.0-rc1~1^2) we attached
the icon source files to all consumers of `CMakeGUILib`, but that
includes other libraries like `CMakeGUIMainLib`.  The latter library is
meant only for direct consumption by a GUI executable, so use that to
propagate the icons instead.
 2020-10-14 09:35:58 -04:00
Brad King 0b0df2d063 CMake 3.19.0-rc1 v3.19.0-rc1 2020-10-13 12:40:27 -04:00
Brad King 7e52b82611 Merge topic 'cmake-gui-windows-icon' into release-3.19 
f7ae4f572b cmake-gui: Restore application icon on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5362
 2020-10-13 12:39:49 -04:00
Brad King f7ae4f572b cmake-gui: Restore application icon on Windows 
In commit 41e223deb3 (CMake GUI: Split up into libraries, add test shim,
2020-09-14) the Windows resource source file that references the icon
was moved to CMakeGUILib, but it needs to be directly in the main
application in order to be attached properly.
 2020-10-13 12:09:28 -04:00
Brad King f04bad9091 Merge topic 'cmake-gui-macos-icon' into release-3.19 
efe48189bf cmake-gui: Restore application icon on macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5361
 2020-10-13 11:10:25 -04:00
Brad King efe48189bf cmake-gui: Restore application icon on macOS 
In commit 41e223deb3 (CMake GUI: Split up into libraries, add test shim,
2020-09-14) the macOS icon source file was moved to CMakeGUILib, but it
needs to be directly in the main application in order to be attached to
the `.app` in the right place.
 2020-10-13 10:35:14 -04:00
Brad King 33ad20b8f9 Merge topic 'android-api-level-range' into release-3.19 
8e4aa63c7b Android: show supported API level in error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5358
 2020-10-13 08:44:04 -04:00
Haibo Huang 8e4aa63c7b Android: show supported API level in error message 2020-10-13 08:40:44 -04:00
Brad King 01ae8149b8 Merge topic 'android-verify-abi-in-ndk' into release-3.19 
5c2f9e3eeb Android: Fatal if ABI is not supported by NDK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5351
 2020-10-13 08:38:54 -04:00
Brad King df87db1fac Merge topic 'export-namelink-only-comment-removal' into release-3.19 
0a9af79995 export: Remove leftover inaccurate code comment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5359
 2020-10-13 08:27:18 -04:00
Brad King ce6f9610b3 Merge topic 'FindPython-Apple-python3' into release-3.19 
5772ca0a53 FindPython: Ensure Apple Xcode python 3 is usable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5356
 2020-10-13 08:26:14 -04:00
Craig Scott 0a9af79995 export: Remove leftover inaccurate code comment 
No functional changes.

Relates: !5352
 2020-10-13 21:38:29 +11:00
Craig Scott 446874a8a1 Merge topic 'export-namelink-only' into release-3.19 
64690f6df0 export: Do not fail generation for namelink-only case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5352
 2020-10-12 19:19:32 -04:00
Kyle Edwards 55fce4425f Merge topic 'cmake-presets-documentation-fix' into release-3.19 
94c955e508 Tests: Test the CMakePresets.json example in the documentation
d6af1e83bc Help: Fix documentation of CMakePresets.json's cacheVariables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5353
 2020-10-12 14:04:41 -04:00
Kyle Edwards 6437343c91 Merge topic 'ninja-multi-segfault' into release-3.19 
f4215ee57d Ninja Multi-Config: Fix segfault when installing an export
18372afcd4 Help: Fix documentation for Ninja Multi-Config's build.ninja

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5355
 2020-10-12 14:03:18 -04:00
Marc Chevrier 5772ca0a53 FindPython: Ensure Apple Xcode python 3 is usable 
The python 3 distributed as part of Xcode requires the specification
of a 'rpath' pointing at frameowrks root for a correct execution.

Fixes: #21293
 2020-10-12 15:45:55 +02:00
Deniz Bahadir 64690f6df0 export: Do not fail generation for namelink-only case 2020-10-09 22:29:22 +02:00
Kyle Edwards 94c955e508 Tests: Test the CMakePresets.json example in the documentation 2020-10-09 15:35:54 -04:00
Kyle Edwards f4215ee57d Ninja Multi-Config: Fix segfault when installing an export 
Fixes: #21290
 2020-10-09 13:51:01 -04:00
Kyle Edwards 18372afcd4 Help: Fix documentation for Ninja Multi-Config's build.ninja 2020-10-09 13:50:36 -04:00