Commit Graph

43131 Commits

Author SHA1 Message Date
Brad King
f70367e4ed Merge topic 'cmSystemTools-StringToULong-negatives'
f0948499f6 cmSystemTools: Fix StringToULong to reject negative numbers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3216
2019-04-12 07:58:52 -04:00
Brad King
d798d2f7c5 Merge topic 'argument-parser-warning'
aeddf63587 cmArgumentParser: Fix -Wcomma warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3214
2019-04-12 07:58:01 -04:00
Brad King
90c616b936 Merge branch 'release-3.14' 2019-04-12 07:45:35 -04:00
Brad King
a5932438cd Merge topic 'fix-overlay-icon-windows'
12ef832c96 cmake-gui: Fix icon overlay on windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3217
2019-04-12 07:29:20 -04:00
Brad King
680641a882 Merge topic 'xcode-extra-sources'
428c1e429f Xcode: Avoid mutating App Bundle targets during generation
b4385d5ccc Xcode: Factor out duplicate source group code into lambda

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3208
2019-04-12 07:23:31 -04:00
Kitware Robot
1601b47b3e CMake Nightly Date Stamp 2019-04-12 00:01:09 -04:00
Brad King
6a39d3df54 Merge branch 'fix-overlay-icon-windows' into release-3.14
Merge-request: !3217
2019-04-11 14:04:54 -04:00
Julien Jomier
12ef832c96 cmake-gui: Fix icon overlay on windows
Since commit 9175a378f5 (QtDialog: Add windows taskbar progress,
2018-11-17, v3.14.0-rc1~330^2) we've added a missing overlay icon.
This results in Windows falling back to a default overlay icon.
Simply drop this line.

Fixes: #19160
2019-04-11 14:03:29 -04:00
Brad King
f0948499f6 cmSystemTools: Fix StringToULong to reject negative numbers
Fixes: #19161
2019-04-11 12:56:32 -04:00
Brad King
aeddf63587 cmArgumentParser: Fix -Wcomma warning
Clang `-Wcomma` warns:

```
Source/cmArgumentParser.cxx:58:42: warning: possible misuse of comma operator
  this->CurrentList = (val.emplace_back(), &val.back());
                                         ^
```

This was introduced by commit 4359fe133b (Introduce cmArgumentParser,
2019-03-23).  Suppress it with the suggested cast.
2019-04-11 10:44:38 -04:00
Brad King
7bad2464fc Merge branch 'xcode-extra-sources' into release-3.14
Merge-request: !3208
2019-04-11 10:35:49 -04:00
Brad King
428c1e429f Xcode: Avoid mutating App Bundle targets during generation
For `MACOSX_BUNDLE` targets we generate an `Info.plist` automatically
and add it to the sources presented to Xcode.  Avoid mutating the
original target's list of sources to achieve this.  Otherwise when we
generate the same target again (e.g. in a sub-project's Xcode file) it
will look different than the first time and possibly break invariants.

Fixes: #19114
2019-04-11 10:35:14 -04:00
Brad King
b4385d5ccc Xcode: Factor out duplicate source group code into lambda 2019-04-11 10:35:14 -04:00
Brad King
a550e2d6e4 Merge topic 'test-autogen-GAT-generator'
06dab0f0e5 Tests: Fix Qt*Autogen.GlobalAutogenTarget to use matching generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3210
2019-04-11 10:13:47 -04:00
Brad King
5ae15061c3 Merge topic 'test-explicit-dirs'
39e7fd8c68 Tests: Avoid enabling languages in RunCMake.CommandLine -S and -B cases
baed22c4b0 Tests: Fix RunCMake.CommandLine test to use generator with -S and -B
44d6370db3 Tests: Add RunCMake helper to run cmake with options
538721939f Tests: Teach RunCMake to optionally exclude the source dir argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3209
2019-04-11 10:12:32 -04:00
Kitware Robot
be101e909e CMake Nightly Date Stamp 2019-04-11 00:01:09 -04:00
Brad King
06dab0f0e5 Tests: Fix Qt*Autogen.GlobalAutogenTarget to use matching generator
Build the GAT project with the same generator as the rest of the test.
This was accidentally left out of commit 8c8731b422 (Autogen: Add test
for CMAKE_GLOBAL_AUTOGEN/RCC_TARGET, 2018-11-11, v3.14.0-rc1~396^2~2).
2019-04-10 10:01:19 -04:00
Brad King
39e7fd8c68 Tests: Avoid enabling languages in RunCMake.CommandLine -S and -B cases
The test project does not compile any sources and so does not
need to enable any languages.
2019-04-10 09:40:48 -04:00
Brad King
baed22c4b0 Tests: Fix RunCMake.CommandLine test to use generator with -S and -B
The `-S` and `-B` command-line option tests do generate build systems
and so should use the generator being tested.
2019-04-10 09:40:48 -04:00
Brad King
44d6370db3 Tests: Add RunCMake helper to run cmake with options 2019-04-10 09:40:48 -04:00
Brad King
538721939f Tests: Teach RunCMake to optionally exclude the source dir argument 2019-04-10 09:40:48 -04:00
Brad King
876680e94b Merge topic 'meta-feature_only_infer_granular_support'
613ac56e50 Add a test to verify meta-feature parity with granular features
b0f46c48f6 CompileFeatures: Now able to presume full language level support
646fb1a646 CompileFeatures: memoize C++ compilers with full language level support
0d641fcfad Tests: Remove outdated portion of CompileFeatures genex test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3176
2019-04-10 08:49:21 -04:00
Kitware Robot
784c35b444 CMake Nightly Date Stamp 2019-04-10 00:01:10 -04:00
Craig Scott
6aef0aa5fe Merge branch 'release-3.14' 2019-04-10 07:57:12 +10:00
Craig Scott
0a29875313 Merge topic 'fix-submit-url'
b8cb63457e Modules/CTest: Fix SubmitURL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3206
2019-04-09 17:55:34 -04:00
Craig Scott
127d0ea2a6 Merge branch 'fix-submit-url' into release-3.14
Merge-request: !3206
2019-04-10 07:54:29 +10:00
Regina Pfeifer
b8cb63457e Modules/CTest: Fix SubmitURL
Problem appeared in d6475daa79 (Modules/CTest: Set SubmitURL, 2018-12-08).

Fixes: #19099
2019-04-10 07:43:20 +10:00
Robert Maynard
613ac56e50 Add a test to verify meta-feature parity with granular features 2019-04-09 08:44:56 -04:00
Robert Maynard
b0f46c48f6 CompileFeatures: Now able to presume full language level support
Previously compilers that only supported the meta-level flags
would not have any of the granular features listed. Now we
presume that they have full support and enable all the features.

Update granular feature tests to skip the actual compilation
checks for the presumed features.
2019-04-09 08:44:56 -04:00
Robert Maynard
646fb1a646 CompileFeatures: memoize C++ compilers with full language level support
Previously compilers that had full support for a language standard level
were still verified every time a new build directory was created.  Now
we record this information and insert the correct granular compile
features instead of doing a `try_compile`.
2019-04-09 08:44:56 -04:00
Brad King
0d641fcfad Tests: Remove outdated portion of CompileFeatures genex test
The genex part of the test verifies that `$<COMPILE_FEATURES:...>`
evaluates as expected.  It does not need to actually try using code with
the associated features, as that is tested separately.
2019-04-09 08:44:56 -04:00
Brad King
a289d79517 Merge topic 'improve-formatting-of-help'
cb33befe2d Modules: Update documentation formatting
0e4fbb4a1f Help: Improve formatting of Help documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !3199
2019-04-09 08:30:15 -04:00
Brad King
aa0692de67 Merge topic 'argument-parser'
b783e62533 cmExecuteProcessCommand: Port to cmArgumentParser
9bddb03f31 cmParseArgumentsCommand: Port to cmArgumentParser
45edf1ad66 Retire cmCommandArgumentsHelper
f5acecaa6f cmExportCommand: Port to cmArgumentParser
e6b6bb0618 cmInstallCommand: Port to cmArgumentParser
4336a29edd cmFileCommand: Port to cmArgumentParser
4359fe133b Introduce cmArgumentParser

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Leonid Pospelov <pospelovlm@yandex.ru>
Merge-request: !3137
2019-04-09 08:27:31 -04:00
Brad King
6b126c47bd Merge branch 'release-3.14' 2019-04-09 08:03:46 -04:00
Brad King
3d15ae4ea1 Merge topic 'cmake-gui-windows-theme'
18962f8f8f Utilities/Release: Link statically to QWindowsVistaStyle plugin
a53c3f03bc Merge branch 'backport-cmake-gui-windows-theme'
fce03306ee cmake-gui: Fix theme on Windows with Qt >= 5.10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3205
2019-04-09 08:01:01 -04:00
Brad King
0e953e138b Merge topic 'implicit-includes-relative'
442f4c4902 Merge branch 'backport-implicit-includes-relative'
ef41d49812 Fix implicit include directory extraction for adaptive relative paths
6bc6fc2a7f Tests: Teach RunCMake.ParseImplicitIncludeInfo to match output by regex
82948805ec Tests: Clarify hand-written cases in RunCMake.ParseImplicitIncludeInfo

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3204
2019-04-09 07:59:52 -04:00
Marc Chevrier
284429ac87 Merge topic 'genex_filter'
698f51abac Genex: Add $<FILTER:list,INCLUDE|EXCLUDE,regex>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3188
2019-04-09 03:20:30 -04:00
Kitware Robot
d6488cb6b3 CMake Nightly Date Stamp 2019-04-09 00:01:09 -04:00
Sebastian Lipponer
698f51abac Genex: Add $<FILTER:list,INCLUDE|EXCLUDE,regex> 2019-04-08 19:57:22 +02:00
Brad King
4f07fdde26 Merge topic 'help_remove_duplicates'
32d7b0cc2c Help: Move entry to correct section in cmake-generator-expressions(7) manual
68b307caae Help: Add missing release notes for genex $<REMOVE_DUPLICATES:list>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3200
2019-04-08 13:52:23 -04:00
Brad King
dff61585f3 Merge branch 'backport-cmake-gui-windows-theme' into release-3.14
Merge-request: !3205
2019-04-08 13:38:42 -04:00
mistersandman
18962f8f8f Utilities/Release: Link statically to QWindowsVistaStyle plugin
We now build with Qt 5.12.  This plugin is needed with Qt >= 5.10.

Fixes: #19147
Suggested-by: mistersandman on gitlab.kitware.com
2019-04-08 13:30:36 -04:00
Brad King
a53c3f03bc Merge branch 'backport-cmake-gui-windows-theme' 2019-04-08 13:30:26 -04:00
mistersandman
fce03306ee cmake-gui: Fix theme on Windows with Qt >= 5.10
In Qt 5.10 the theme support moved to a separate QWindowsVistaStyle
plugin.

Issue: #19147
2019-04-08 13:30:05 -04:00
Sebastian Lipponer
32d7b0cc2c Help: Move entry to correct section in cmake-generator-expressions(7) manual
The generator expression $<REMOVE_DUPLICATES:list> is string-valued, not
boolean-valued.
2019-04-08 19:19:29 +02:00
Sebastian Lipponer
68b307caae Help: Add missing release notes for genex $<REMOVE_DUPLICATES:list> 2019-04-08 19:19:29 +02:00
Brad King
30f68934e9 Merge branch 'backport-implicit-includes-relative' into release-3.14
Merge-request: !3204
2019-04-08 10:44:46 -04:00
Brad King
442f4c4902 Merge branch 'backport-implicit-includes-relative' 2019-04-08 10:16:47 -04:00
Brad King
ef41d49812 Fix implicit include directory extraction for adaptive relative paths
In some cases GCC reports *relative* implicit include directories.  They
are computed adaptively with respect to the current working directory
such that the effective implicit include directory is an unchanging
absolute path.  Teach our implicit include directory extraction to
recognize such paths and normalize them.

Fixes: #19133
2019-04-08 10:12:22 -04:00
Brad King
6bc6fc2a7f Tests: Teach RunCMake.ParseImplicitIncludeInfo to match output by regex 2019-04-08 10:12:22 -04:00