Commit Graph

26265 Commits

Author SHA1 Message Date
Brad King fcfbc01d68 Merge topic 'cmTarget_pimpl'
de0d57c97a cmTarget: Use std::unique_ptr instead of custom smart pointer
ecc782c75d cmTarget: Single line comment clanups
be2764a657 cmTarget: Make private `SetPropertyDefault` an in code lambda `InitProperty`
2bfee8a58b cmTarget: Remove obsolete `friend` definitions
a65a404186 cmTarget: Inline private HasImportLibrary method
ff91071a14 cmTarget: Move member method `CheckImportedLibName` to impl
afc4612fa5 cmTarget: Move member method `ProcessSourceItemCMP0049()` to impl
72b0eeeb21 cmTarget: Move member booleans to impl
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Daniel Pfeifer <daniel@pfeifer-mail.de>
Merge-request: !3142
2019-03-27 13:25:35 -04:00
Kitware Robot d2c0350c7b CMake Nightly Date Stamp 2019-03-27 00:01:08 -04:00
Brad King 36611418ab Merge topic 'cmGlobalGenerator_code_maintenance'
b289243d99 cmGlobalGenerator: Inline `aRange` acquisition in `for(x:aRange)` invocations
bf9afa1e15 cmGlobalGenerator: Use auto for long iterator types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Daniel Pfeifer <daniel@pfeifer-mail.de>
Merge-request: !3144
2019-03-26 11:00:44 -04:00
Brad King f288383b3f Merge topic 'fix_autogen_deadlock'
e7a760fe7d Autogen: Fix deadlock when uv_spawn() fails while trying to run moc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: Sebastian Holtermann <sebholt@xwmw.org>
Merge-request: !3139
2019-03-26 10:59:57 -04:00
Brad King 8494bc2713 Merge topic 'toolchain-include_directories'
588fa1bb9e Restore support for include_directories() in toolchain files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3140
2019-03-26 10:56:34 -04:00
Kitware Robot db20cb2f9f CMake Nightly Date Stamp 2019-03-26 00:01:07 -04:00
Brad King 9fbad8b40b Merge topic 'ctest_submit_get_buildid'
ba7e44eb7a ctest_submit: Add option BUILD_ID

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Zack Galbreath <zack.galbreath@kitware.com>
Merge-request: !3120
2019-03-25 11:52:25 -04:00
Brad King 588fa1bb9e Restore support for include_directories() in toolchain files
Any `include_directories()` calls in toolchain files are used during our
ABI detection step even though it does not include any system headers.
Since commit 5990ecb741 (Compute implicit include directories from
compiler output, 2018-12-07, v3.14.0-rc1~108^2), that check is also used
to detect implicit include directories.  Any `include_directories()` in
a toolchain file are detected as implicit and later excluded from
explicit specification on compiler command lines, thus breaking the
purpose of the calls in the first place.

Fix the implicit include directory detection step to avoid using paths
from `include_directories()` calls in the toolchain file.

Fixes: #19079
2019-03-25 11:48:17 -04:00
Sebastian Holtermann b289243d99 cmGlobalGenerator: Inline aRange acquisition in for(x:aRange) invocations
Changes the following code snippets in `cmGlobalGenerator`
```
AType aRange = object.getRange();
for ( auto & item: aRange) {
```
to

```
for ( auto & item: object.getRange()) {
```
2019-03-25 13:51:22 +01:00
Sebastian Holtermann bf9afa1e15 cmGlobalGenerator: Use auto for long iterator types 2019-03-25 13:51:22 +01:00
Alexandru Croitor e7a760fe7d Autogen: Fix deadlock when uv_spawn() fails while trying to run moc
If by some chance the moc executable does not exist while running
AUTOMOC, instead of showing an error, the CMake Autogen invocation
hangs indefinitely.

This happens because UVProcessFinished() is not called if the process
does not launch correctly.

Make sure to call UVProcessFinished() even if the process launch fails,
and also report the error returned by libuv.
2019-03-25 11:43:14 +01:00
Kitware Robot e7fb007b61 CMake Nightly Date Stamp 2019-03-25 00:01:08 -04:00
Kitware Robot c85f23a016 CMake Nightly Date Stamp 2019-03-24 00:01:07 -04:00
Sebastian Holtermann de0d57c97a cmTarget: Use std::unique_ptr instead of custom smart pointer
To manage the lifetime of `cmTargetInternals`, the private implementation of
`cmTarget`, use `std::unique_ptr<cmTargetInternals>` instead of
`cmTargetInternalPointer`, which is removed.

`cmTarget` is made non-copyable but movable.
2019-03-23 22:22:34 +01:00
Sebastian Holtermann ecc782c75d cmTarget: Single line comment clanups 2019-03-23 22:22:34 +01:00
Sebastian Holtermann be2764a657 cmTarget: Make private SetPropertyDefault an in code lambda InitProperty 2019-03-23 22:22:34 +01:00
Sebastian Holtermann 2bfee8a58b cmTarget: Remove obsolete friend definitions 2019-03-23 22:22:34 +01:00
Sebastian Holtermann a65a404186 cmTarget: Inline private HasImportLibrary method 2019-03-23 22:22:34 +01:00
Sebastian Holtermann ff91071a14 cmTarget: Move member method CheckImportedLibName to impl 2019-03-23 22:22:34 +01:00
Sebastian Holtermann afc4612fa5 cmTarget: Move member method ProcessSourceItemCMP0049() to impl 2019-03-23 22:22:34 +01:00
Sebastian Holtermann 72b0eeeb21 cmTarget: Move member booleans to impl 2019-03-23 22:22:34 +01:00
Sebastian Holtermann db182eb160 cmTarget: Move member *Commands to impl 2019-03-23 22:22:34 +01:00
Sebastian Holtermann 30495bb1c2 cmTarget: Move member RuntimeInstallPath to impl 2019-03-23 21:45:10 +01:00
Sebastian Holtermann 0dcef68cd8 cmTarget: Move member InstallPath to impl 2019-03-23 21:45:10 +01:00
Sebastian Holtermann 5db17e9d81 cmTarget: Move member Name to impl 2019-03-23 21:45:10 +01:00
Sebastian Holtermann ccf76c6e4c cmTarget: Move member TLLCommands to impl 2019-03-23 21:45:10 +01:00
Sebastian Holtermann 7742bf4ff5 cmTarget: Move member Backtrace to impl 2019-03-23 21:45:09 +01:00
Sebastian Holtermann 2c14eb4852 cmTarget: Move member PolicyMap to impl 2019-03-23 21:45:09 +01:00
Sebastian Holtermann f6241db3e0 cmTarget: Move member OriginalLinkLibraries to impl 2019-03-23 21:45:09 +01:00
Sebastian Holtermann 3c09bf0fa7 cmTarget: Move member Utilities to impl 2019-03-23 21:45:09 +01:00
Sebastian Holtermann 856a271fb7 cmTarget: Move member SystemIncludeDirectories to impl 2019-03-23 21:45:09 +01:00
Sebastian Holtermann 46075091d5 cmTarget: Move member Properties to impl class 2019-03-23 21:15:32 +01:00
Sebastian Holtermann 2cd4104600 cmTarget: Move member Makefile to impl 2019-03-23 15:10:50 +01:00
Sebastian Holtermann fa8e2dfc7b cmTarget: Move member TargetType to impl 2019-03-23 15:04:56 +01:00
Sebastian Holtermann c9bd2e941f cmTarget: Rename member Internal to impl 2019-03-23 15:04:42 +01:00
Kitware Robot 4bbd315097 CMake Nightly Date Stamp 2019-03-23 00:01:09 -04:00
Zack Galbreath ba7e44eb7a ctest_submit: Add option BUILD_ID
Fixes: #18968
2019-03-22 09:37:08 -04:00
Brad King 89abbdd8c8 Merge topic 'ghs-linux'
2c43fb5be3 FindThreads: Fix pthread library check in GHS Multi Generator
0404efe786 GHS: Add support for GHS Multi Generator in Linux
2060a1445c Tests: Fix file name case in GHS object library test
ddad70c8a4 Tests: Run GHS tests in a separate ctest process
f7dca1fc97 GHS: Fix include-what-you-use and clang-tidy diagnostics

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3006
2019-03-22 09:22:44 -04:00
Brad King 4e47e9967a Merge topic 'cmTarget_non_copyable'
204c5ccb43 cmMakefile: Use std::unordered_map::emplace to add cmTargets to the list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3134
2019-03-22 09:19:55 -04:00
Brad King fb05b6a8f5 Merge topic 'cmTarget_micro_fixes'
965da8d787 cmTarget: Acquire data only when needed
03d17a35b5 cmTarget: Use helper function to append to lists

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3135
2019-03-22 09:19:09 -04:00
Brad King 6d8f0627a3 Merge topic 'update-kwsys'
d79fa9dd55 Merge branch 'upstream-KWSys' into update-kwsys
868dc1a121 KWSys 2019-03-21 (fd41ac36)
775c8b21da update-third-party: update from upstream

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3136
2019-03-22 09:16:56 -04:00
Brad King 3744bd0a0a Merge topic 'xcodescheme2'
413b71485a Xcode: Create Xcode schemes per target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3098
2019-03-22 09:16:02 -04:00
Kitware Robot 94be5f9344 CMake Nightly Date Stamp 2019-03-22 00:01:09 -04:00
Sebastian Holtermann 204c5ccb43 cmMakefile: Use std::unordered_map::emplace to add cmTargets to the list
When adding cmTargets to a cmMakefile, use std::unordered_map::emplace instead
of std::unordered_map::insert.
2019-03-21 20:43:48 +01:00
Naren Manimohan 0404efe786 GHS: Add support for GHS Multi Generator in Linux 2019-03-21 12:57:40 -04:00
Harry Mallon 413b71485a Xcode: Create Xcode schemes per target 2019-03-21 16:50:41 +00:00
Brad King d79fa9dd55 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2019-03-21 (fd41ac36)
2019-03-21 12:38:42 -04:00
Sebastian Holtermann 965da8d787 cmTarget: Acquire data only when needed 2019-03-21 16:58:29 +01:00
Sebastian Holtermann 03d17a35b5 cmTarget: Use helper function to append to lists 2019-03-21 16:57:27 +01:00
Kyle Edwards fac093802a Merge topic 'tar-improve-error-handling'
ea9a2c1759 cmake: tar: Parse 'cmake -E tar' arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3081
2019-03-21 10:50:38 -04:00