mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-06 07:09:49 -06:00
Code Issues Packages Projects Releases Wiki Activity
50,284 Commits 2 Branches 390 Tags
8f7fef629b37e38341bfb8b99a276df9355551ec
Commit Graph

29665 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Cristian Adam
06a9a3bdc3 file(CONFIGURE): Allow angle brackets in content 
Fixes: #21306
 2020-10-15 15:42:21 +02: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
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
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 2020-10-13 12:40:27 -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
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
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
Deniz Bahadir
64690f6df0 export: Do not fail generation for namelink-only case 2020-10-09 22:29:22 +02:00
Kyle Edwards
f4215ee57d Ninja Multi-Config: Fix segfault when installing an export 
Fixes: #21290
 2020-10-09 13:51:01 -04:00
Brad King
302b00a262 Begin 3.19 release versioning 2020-10-08 11:23:38 -04:00
Brad King
8f2ba9a3fc Merge topic 'ignore_MSB_warnings' 
b756ec8a46 cm_cxx_features: Filter out MSBXXXX warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5348
 2020-10-08 09:29:02 -04:00
Anonymous Maarten
b756ec8a46 cm_cxx_features: Filter out MSBXXXX warnings 
When building CMake in `%TMP%` on Windows, MSBuild issues warnings.
Filter those out to avoid breaking C++ feature checks.

Fixes: #21270
 2020-10-08 09:24:02 -04:00
Kitware Robot
75a486f8c0 CMake Nightly Date Stamp 2020-10-08 00:01:15 -04:00
Brad King
c4c86acaac Merge topic 'cmake-presets-empty-var' 
a395cb516b CMakePresets.json: Prohibit empty variable names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5339
 2020-10-07 07:25:52 -04:00
Kitware Robot
a410755597 CMake Nightly Date Stamp 2020-10-07 00:01:18 -04:00
Kyle Edwards
a395cb516b CMakePresets.json: Prohibit empty variable names 2020-10-06 12:09:38 -04:00
Brad King
8c4c658ab0 Merge topic 'cmake-presets' 
6f8fdc686c .gitignore: Add CMakeUserPresets.json
1d25760198 Help: Add presets documentation and release notes
a4382f72d7 CMake GUI: Add presets functionality
8617479061 CMake: Add presets functionality
06128cf949 Presets: Add cmCMakePresetsFile class
5a36542086 Refactor: Add allowArch parameter to cmake::CreateGlobalGenerator()
3059e6aed7 cmJSONHelpers: Add new Bind() function
8682d1b7b2 CMake GUI Tests: Increase default sleep time

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Hirsch, Ph.D. <michael@scivision.dev>
Merge-request: !5169
 2020-10-06 10:49:59 -04:00
Brad King
3cc3d42aba CMake 3.18.4 2020-10-06 08:28:17 -04:00
Brad King
e0045916c2 Merge topic 'fix-uninitialized-21166' 
c27553afb2 cmCTestBuildHandler: Avoid uninitialized line-numbers
e4e85c5b2d cmake: Fix uninitialized member in HandleDeleteCacheVariables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5321
 2020-10-06 06:55:31 -04:00
Brad King
c814172e84 Merge topic 'csharp-source_group-bugfix' 
8d87cfdbf3 VS: Fix regression in C# source links

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5314
 2020-10-06 06:47:19 -04:00
Kitware Robot
bac0e0adb6 CMake Nightly Date Stamp 2020-10-06 00:01:15 -04:00
Kinan Mahdi
8d87cfdbf3 VS: Fix regression in C# source links 
Fix logic used since commit ac6b18cd90 (CSharp: Add support for source
groups with out-of-source builds, 2020-02-18, v3.18.0-rc1~645^2).
Add a check of the physical file location for C# source groups.
 2020-10-05 12:49:14 -04:00
Kyle Edwards
a4382f72d7 CMake GUI: Add presets functionality 2020-10-05 09:49:59 -04:00
Kyle Edwards
8617479061 CMake: Add presets functionality 2020-10-05 09:49:59 -04:00
Kyle Edwards
06128cf949 Presets: Add cmCMakePresetsFile class 2020-10-05 09:49:59 -04:00
Kyle Edwards
5a36542086 Refactor: Add allowArch parameter to cmake::CreateGlobalGenerator() 2020-10-05 09:49:59 -04:00
Kyle Edwards
3059e6aed7 cmJSONHelpers: Add new Bind() function 2020-10-05 09:49:59 -04:00
Adriaan de Groot
c27553afb2 cmCTestBuildHandler: Avoid uninitialized line-numbers 
When commands fail, there is no line number to report; still initialize
it explicitly to avoid compiler warnings.

Issue: #21166
 2020-10-05 09:14:32 -04:00
Adriaan de Groot
e4e85c5b2d cmake: Fix uninitialized member in HandleDeleteCacheVariables 
If there is no existing value, mark the saved entry as UNINITIALIZED
(avoids compiler warning about uninitialized type).

Issue: #21166
 2020-10-05 09:13:18 -04:00
Kitware Robot
a0964cbe63 CMake Nightly Date Stamp 2020-10-05 00:01:34 -04:00
Craig Scott
1291dd3103 Merge topic 'xcode-refactor-framework-linking' 
ce2dee9e5b Xcode: Don't add framework as -framework argument in linker info list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5216
 2020-10-04 17:05:57 -04:00
Kitware Robot
3ae3b352d1 CMake Nightly Date Stamp 2020-10-04 00:01:13 -04:00
Kitware Robot
63aa279343 CMake Nightly Date Stamp 2020-10-03 00:01:16 -04:00
Brad King
a64c779746 Merge topic 'execute_process-fatal-error' 
116a427eb1 execute_process: add options for fatal errors on subprocess failure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5243
 2020-10-02 08:38:53 -04:00
Brad King
038b757561 Merge topic 'ctest-memcheck-compute-sanitizer' 
050720f3ad CTest: add compute-sanitizer alias for cuda-memcheck

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5305
 2020-10-02 08:35:06 -04:00
Marc Chevrier
b4a14fecb0 Merge topic 'optimize-cmListFileFunction' 
e614528ad1 cmListFileCache: Make cmListFileFunction a shared pointer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5228
 2020-10-02 08:27:12 -04:00
Gusts Kaksis
ce2dee9e5b Xcode: Don't add framework as -framework argument in linker info list 2020-10-02 22:13:00 +10:00