reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-03-03 17:39:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
44,767 Commits 4 Branches 185 Tags
Commit Graph

44767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
57fc6c587a Merge topic 'xcode11-compatibility' 
3186bb91ed Xcode: Make iOS tests compatible with Xcode 11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3743
 2019-08-27 11:00:53 -04:00
Brad King
bd4d52f7de Merge topic 'GNUInstallDirs-arch-linux' 
18365587c8 GNUInstallDirs: Keep 'lib' as default LIBDIR on Arch Linux based systems

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3735
 2019-08-27 10:58:28 -04:00
Brad King
613ac3e7d5 Merge topic 'swift-version' 
369c48ee43 Swift: honour `-swift-version` in Ninja generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3685
 2019-08-27 10:57:26 -04:00
Brad King
d16402ddc4 Merge topic 'ctest-CLICOLOR_FORCE' 
074a6a8cf6 CTest: Add env var CLICOLOR_FORCE to force color output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3733
 2019-08-27 10:54:24 -04:00
Brad King
52a8fb2d53 Merge branch 'release-3.15' 2019-08-27 10:24:57 -04:00
Brad King
4a4001477d Merge topic 'alpine-cpu_zero' 
1902e39746 cmAffinity: Add include for CPU_ZERO on Alpine Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3740
 2019-08-27 10:20:50 -04:00
Brad King
297df45d00 Merge topic 'cmGlobalGenerator-compilerId-lifetime' 
17ce0c29ad cmGlobalGenerator: Fix CheckCompilerIdCompatibility local var lifetime

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3741
 2019-08-27 10:18:57 -04:00
Brad King
8a8b2fa695 Merge topic 'libarchive-requirement' 
752fa8be9d libarchive: We now require at least version 3.3.3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3737
 2019-08-27 10:17:20 -04:00
Brad King
2a2c4cc722 Merge topic 'ninja_additional_clean_files_custom_target' 
d040f3f1ee Tests: Extend MakeClean test to test various target types
3ed8cffe73 Ninja: Add support for ADDITIONAL_CLEAN_FILES in custom targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3739
 2019-08-27 10:16:05 -04:00
Brad King
1d68639654 Merge branch 'alpine-cpu_zero' into release-3.15 
Merge-request: !3740
 2019-08-27 10:11:37 -04:00
Brad King
6157c0fe84 Merge branch 'cmGlobalGenerator-compilerId-lifetime' into release-3.15 
Merge-request: !3741
 2019-08-27 10:11:29 -04:00
Brad King
dd6154ca19 Merge branch 'libarchive-requirement' into release-3.15 
Merge-request: !3737
 2019-08-27 10:11:16 -04:00
Brad King
b0566f62eb Merge branch 'ninja_additional_clean_files_custom_target' into release-3.15 
Merge-request: !3739
 2019-08-27 10:11:06 -04:00
Brad King
1902e39746 cmAffinity: Add include for CPU_ZERO on Alpine Linux 
The definition of `CPU_ZERO` requires `<string.h>` to be included
explicitly for `memset`.  Since IWYU does not agree on other Linux
platforms, use a pragma to silence the warning.

Fixes: #19643
 2019-08-27 09:32:32 -04:00
Kitware Robot
65fe80794d CMake Nightly Date Stamp 2019-08-27 00:01:03 -04:00
Gregor Jasny
3186bb91ed Xcode: Make iOS tests compatible with Xcode 11 2019-08-26 21:08:00 +02:00
Saleem Abdulrasool
369c48ee43 Swift: honour -swift-version in Ninja generator 
Swift has supported `CMAKE_Swift_LANGUAGE_VERSION` and
`Swift_LANGUAGE_VERSION` but didn't apply that to Ninja generated
targets.  Consider the property when calculating the flags.
 2019-08-26 11:38:40 -04:00
Antonio Rojas
18365587c8 GNUInstallDirs: Keep 'lib' as default LIBDIR on Arch Linux based systems 
Fixes: #15373
 2019-08-26 11:14:13 -04:00
Marin Baron
074a6a8cf6 CTest: Add env var CLICOLOR_FORCE to force color output 
Base impl on `Source/kwsys/Terminal.c:kwsysTerminalStreamIsVT100`.
This enables pipes/logs with colors.
 2019-08-26 11:04:57 -04:00
Brad King
89479bde94 Merge topic 'pvs-cleanup' 
7fe3e874d5 cmCPackLog: Fix support for multiple log message tags
74f2c0ea56 cmCTestTestHandler: Remove extra layer of parentheses
7c2767ef3b cmCTestMultiProcessHandler: Explain testRun ownership in comments
303e813438 CTest: Simplify some boolean conditions
51565abe79 cmMessageCommand: Remove extra layer of parentheses
b1cfaf7b91 cmVSSetupHelper: Remove unused SmartBSTR copy operations
3f4c4e7afe cmVSSetupHelper: Fix SmartBSTR copy operations
a8ca5aea94 cmMakefileTargetGenerator: Check for null before using a pointer
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Daniel Pfeifer <daniel@pfeifer-mail.de>
Acked-by: Artalus <artalus-mail@yandex.ru>
Merge-request: !3715
 2019-08-26 10:51:11 -04:00
Brad King
37c671570c Merge topic 'source_sweep_ostringstream_single' 
3b2b02825d Source sweep: Replace std::ostringstream when used with a single append

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3726
 2019-08-26 10:49:10 -04:00
Brad King
8685d0d291 Merge topic 'source_sweep_cmExpandedList' 
aaf59120bf Source sweep: Replace cmExpandList with the shorter cmExpandedList

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3725
 2019-08-26 10:47:24 -04:00
Brad King
7290cea75b Merge topic 'FindLibLZMA-windows-debug' 
232f5bd644 FindLibLZMA: Find debug/release variants on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3714
 2019-08-26 10:45:28 -04:00
Brad King
bd3fb4c462 Merge topic 'list-subcommand-table' 
b14bcd9123 cmListCommand: Use cmSubcommandTable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3723
 2019-08-26 10:43:06 -04:00
Brad King
8d019c096e Merge topic 'string-subcommand-table' 
66c2714f22 cmStringCommand: Use cmSubcommandTable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3721
 2019-08-26 10:40:30 -04:00
Brad King
1811f2b371 Merge topic 'cpack-stgz-license-prompt' 
4c8741eb86 CPack/STGZ: Require explicit acceptance or refusal of license

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3717
 2019-08-26 10:37:18 -04:00
Brad King
e7d7cd47ed Merge topic 'group_not_track' 
2a71a0390c ctest: rename TRACK to GROUP

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Zack Galbreath <zack.galbreath@kitware.com>
Merge-request: !3707
 2019-08-26 10:34:55 -04:00
Brad King
7d89c5bf77 Merge topic 'warnings_skip_color' 
2079267959 ctest_build: ignore ANSI color

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3702
 2019-08-26 10:33:08 -04:00
Brad King
f5a7ae0c4b Merge topic 'optional' 
197c5e12ad Source: Add cm::optional
170fcd715f Extend C++17 feature checks to require std::optional

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sebastian Holtermann <sebholt@web.de>
Merge-request: !3644
 2019-08-26 10:31:15 -04:00
Brad King
17ce0c29ad cmGlobalGenerator: Fix CheckCompilerIdCompatibility local var lifetime 
Save the value of the compiler id variable in storage we own so that
mutating it based on a policy does not invalidate the local value for
later comparisons.  This was identified by Clang AddressSanitizer.
 2019-08-26 10:28:32 -04:00
Brad King
4892f73d74 Merge topic 'cmake-msvc-runtime-library' 
74eef37bc7 Utilities/Release: Select MSVC runtime library via abstraction
ed54d87789 Configure CMake itself with policies through CMake 3.15

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3718
 2019-08-26 10:00:46 -04:00
Marvin Schmidt
752fa8be9d libarchive: We now require at least version 3.3.3 
It's the first version including Zstandard support.
 2019-08-26 09:47:24 -04:00
Brad King
7fe3e874d5 cmCPackLog: Fix support for multiple log message tags 
Fix logic from commit bbf1c2d275 (ENH: More improvements and add
logging, 2006-01-02, v2.4.0~712) to append to the accumulated tag string
instead of overwriting it for each type of message.

Issue: #19610
 2019-08-26 09:43:46 -04:00
Brad King
74f2c0ea56 cmCTestTestHandler: Remove extra layer of parentheses 
A condition in `ComputeTestListForRerunFailed` contained an extra layer
of parentheses.  Remove them.  The condition itself is correct because
an empty list means "all tests" so we want to include the current test.

Issue: #19610
 2019-08-26 09:43:46 -04:00
Brad King
7c2767ef3b cmCTestMultiProcessHandler: Explain testRun ownership in comments 
The ownership semantics of the 'testRun' variable are subtle and
may fool static analysers.  Add comments explaining them for now.
Later some refactoring could be done to clarify the code.

Issue: #19610
 2019-08-26 09:43:46 -04:00
Brad King
303e813438 CTest: Simplify some boolean conditions 
Directly compare two boolean values instead of spelling out accepted
combinations.

Issue: #19610
 2019-08-26 09:43:46 -04:00
Brad King
51565abe79 cmMessageCommand: Remove extra layer of parentheses 
The logic checking `CMAKE_WARN_DEPRECATED` contained an unnecessary
layer of parentheses.  The condition is of the form `!IsSet || IsOn`
which is correct because the documentation says that the behavior is
enabled unless the variable is explicitly set to a false value.

Issue: #19610
 2019-08-26 09:43:46 -04:00
Brad King
b1cfaf7b91 cmVSSetupHelper: Remove unused SmartBSTR copy operations 
For our use case we do not actually need to copy these.
Mark the operations as `= delete` to simplify the code.
 2019-08-26 09:43:45 -04:00
Brad King
3f4c4e7afe cmVSSetupHelper: Fix SmartBSTR copy operations 
Fix the SmartBSTR copy constructor and copy assignment operator added by
commit 18c8278b62 (VS: Add helper class to interact with Visual Studio
Installer, 2016-12-14, v3.8.0-rc1~93^2~4) to use the string from the
source of the copy.

Issue: #19610
 2019-08-26 09:43:45 -04:00
Brad King
a8ca5aea94 cmMakefileTargetGenerator: Check for null before using a pointer 
Fix the order of logic added by commit 7740ccd1a4 (ENH: some cleanup of
the makefile generator, 2006-02-14, v2.4.0~517) to check for allocation
failure ('new' returns null) before using the pointer.

Issue: #19610
 2019-08-26 09:43:36 -04:00
Sebastian Holtermann
d040f3f1ee Tests: Extend MakeClean test to test various target types 
This extends the MakeClean test to test the target property
`ADDITIONAL_CLEAN_FILES` on executable, library and custom targets.
 2019-08-26 09:31:03 -04:00
Sebastian Holtermann
3ed8cffe73 Ninja: Add support for ADDITIONAL_CLEAN_FILES in custom targets 
This enables the support for `ADDITIONAL_CLEAN_FILES` in custom targets
using the ninja generator.

Fixes: #19641
 2019-08-26 09:31:03 -04:00
Kitware Robot
0d356e4c94 CMake Nightly Date Stamp 2019-08-26 00:01:03 -04:00
Kitware Robot
2a1be178de CMake Nightly Date Stamp 2019-08-25 00:01:03 -04:00
Kitware Robot
395cbee2fc CMake Nightly Date Stamp 2019-08-24 00:01:12 -04:00
Sebastian Holtermann
3b2b02825d Source sweep: Replace std::ostringstream when used with a single append 
This replaces `std::ostringstream`, when it is written to only once.
If the single written argument was numeric, `std::to_string` is used instead.
Otherwise, the single written argument is used directly instead of the
`std::ostringstream::str()` invocation.
 2019-08-23 18:52:33 +02:00
Braden McDaniel
232f5bd644 FindLibLZMA: Find debug/release variants on Windows 2019-08-23 11:19:21 -04:00
Sebastian Holtermann
aaf59120bf Source sweep: Replace cmExpandList with the shorter cmExpandedList 
This replaces the code pattern
```
std::vector<std::string> args;
cmExpandList(valueStr, args, ...)
```
with
```
std::vector<std::string> args = cmExpandedList(valueStr, ...)
```
 2019-08-23 17:07:49 +02:00
sidju
4c8741eb86 CPack/STGZ: Require explicit acceptance or refusal of license 
To make using the generated STGZ easier, require a specific answer to
accepting the license terms.  Since more moves down one line when '\n'
is entered a user may hold enter to paginate through the document. This
change prevents the user from accidentally refusing the license terms by
holding enter for too long and having to start over.
 2019-08-23 11:04:26 -04:00
Brad King
74eef37bc7 Utilities/Release: Select MSVC runtime library via abstraction 
Use the `CMAKE_MSVC_RUNTIME_LIBRARY` abstraction added by CMake 3.15
instead of hard-coding the `-MT` flag.
 2019-08-23 10:55:59 -04:00