45264 Commits

Author SHA1 Message Date
Kyle Edwards
b741ee820d Tests: Add test for CTest hardware allocation feature 2019-10-02 09:33:54 -04:00
Kyle Edwards
3c8a5aad46 Tests: Write tests for cthwalloc helper tool
This helper tool is sufficiently complex that it warrants having its
own test suite.
2019-10-02 09:33:54 -04:00
Kyle Edwards
2d74e54661 Tests: Write cthwalloc helper tool 2019-10-02 09:33:54 -04:00
Kyle Edwards
e34de0691b CTest: Allocate hardware to tests 2019-10-02 09:33:54 -04:00
Kyle Edwards
aee0964851 CTest: Add bin-packing algorithm
This algorithm is used to determine whether or not a test can
execute with the available resources. It uses a recursive largest-
first algorithm to try to place the tests into their respective
slots.
2019-10-02 09:33:54 -04:00
Kyle Edwards
c494b2973a CTest: Add cmCTestHardwareAllocator class 2019-10-02 09:33:54 -04:00
Kyle Edwards
c8f4806943 CTest: Add parser for hardware spec file 2019-10-02 09:33:54 -04:00
Kyle Edwards
bb4a141059 CTest: Add lexer for PROCESSES property 2019-10-02 09:33:54 -04:00
Brad King
a1f78a481c Merge topic 'ninja-depend-shared-symlinks'
4891f0f966 Ninja: Ensure shared library version symlinks are created for dependents

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3875
2019-10-02 07:57:25 -04:00
Brad King
d57c1a5b31 Merge topic 'clang-format-normalize-headers-presentation'
ed98209ddc Revise include order using clang-format-6.0
185fe49f29 clang-format: Normalize headers presentation
42ef28b4f3 Remove unused uid_t/gid_t types on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sebastian Holtermann <sebholt@web.de>
Merge-request: !3851
2019-10-02 07:53:43 -04:00
Brad King
a4f404d0a5 Merge branch 'release-3.15' 2019-10-02 07:52:16 -04:00
Brad King
0c5f78478e Merge topic 'xcode-debug-document-versioning'
67200c37b0 xcode: Add XCODE_SCHEME_DEBUG_DOCUMENT_VERSIONING property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3876
2019-10-02 07:51:06 -04:00
Brad King
9649c91f83 Merge topic 'pch-compile-pdb'
e6e189e02b PCH: Report error when setting COMPILE_PDB_NAME property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3864
2019-10-02 07:48:55 -04:00
Brad King
20e9151e6c Merge topic 'vs-v142-version'
5117389931 VS: Fix support for v142 toolset minor versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3874
2019-10-02 07:47:25 -04:00
Brad King
c5bec56611 Merge topic 'test-iface-paths'
335236b0cb Tests: Shorten name RunCMake.IfacePaths_{INCLUDE_DIRECTORIES => INCDIRS}

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3873
2019-10-02 07:41:39 -04:00
Kitware Robot
f3ba8bf402 CMake Nightly Date Stamp 2019-10-02 00:01:11 -04:00
Gregor Jasny
67200c37b0 xcode: Add XCODE_SCHEME_DEBUG_DOCUMENT_VERSIONING property 2019-10-01 23:02:35 +02:00
Brad King
4891f0f966 Ninja: Ensure shared library version symlinks are created for dependents
When linking to a shared library target that has version symlinks, add
an order-only dependency on the build statement that creates the links.
This ensures that the links exist for use at runtime.

Fixes: #19774
2019-10-01 14:34:03 -04:00
Cristian Adam
e6e189e02b PCH: Report error when setting COMPILE_PDB_NAME property
Reusable precompile headers require specific COMPILE_PDB_NAME property
values. Report error if the user tries to set a different value.
2019-10-01 18:33:40 +02:00
Kitware Robot
ed98209ddc Revise include order using clang-format-6.0
Run the `clang-format.bash` script to update our C and C++ code to a new
include order `.clang-format`.  Use `clang-format` version 6.0.
2019-10-01 12:26:36 -04:00
Marc Chevrier
185fe49f29 clang-format: Normalize headers presentation
By using clang-format directives 'IncludeBlocks' and 'IncludeCategories'
headers are regrouped by categories:
1. "cmConfigure.h" which must be first
2. header matching current implementation file
3. standard language headers
4. CMake replacement ones
5. external  headers (i.e. #include directive with '<' and '>')
6. Qt headers
7. cmsys/* headers
8. cm_* headers
9. CMake headers (i.e. starting with 'cm[A-Z]')
10. all other headers

Fixes: #19674
2019-10-01 12:25:48 -04:00
Brad King
42ef28b4f3 Remove unused uid_t/gid_t types on Windows
These were added and used by commit 5299141320 (CPackDeb: Enable the DEB
generator on Windows, 2017-06-17, v3.10.0-rc1~445^2) but have not been
used since commit df556e65f2 (cmCPackDebGenerator: Use libarchive to
create .deb file, 2017-08-24, v3.10.0-rc1~220^2).
2019-10-01 12:25:43 -04:00
Brad King
62d65286e7 Merge topic 'fix-EXCLUDE_FROM_ALL-subdir-all'
8a15e75fe3 Tests: Cover EXCLUDE_FROM_ALL OFF on sub/sub/tgt in sub/all
7420843370 Makefiles: Fix EXCLUDE_FROM_ALL OFF on sub/sub/tgt in sub/all
d713bcb642 Ninja: Factor out per-dir "all" target computation into common generator
a75586c775 Ninja: Simplify top-level "all" target generation
a49cd4d1a7 Ninja: Fix EXCLUDE_FROM_ALL OFF on sub/sub/tgt in sub/all
0733a94f64 Ninja,Makefile: Fix subdir "all" with nested EXCLUDE_FROM_ALL subdir
11fb377eb9 cmLocalUnixMakefileGenerator3: Mark GetRelativeTargetDirectory const
be7857f40d cmLocalCommonGenerator: Mark GetConfigName as const
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3869
2019-10-01 12:25:13 -04:00
Brad King
f695b6b3bb Merge branch 'vs-v142-version' into release-3.15
Merge-request: !3874
2019-10-01 11:41:32 -04:00
Brad King
5117389931 VS: Fix support for v142 toolset minor versions
When using `-T v142,version=14.22` the `.props` file location is
different starting with version `14.20` than it was in `14.16` and
below.  Adapt the path based on the version.

Fixes: #19779
2019-10-01 11:39:38 -04:00
Brad King
ec16afc9e8 Merge topic 'typos'
ab06de68c5 Help: fixed typos in PCH / Unity Build doc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3870
2019-10-01 11:06:22 -04:00
Brad King
7ad49fa333 Merge topic 'FindCurses-ncursesw'
048860e172 FindCurses: toplevel ncursesw support, recover cflags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3845
2019-10-01 11:03:18 -04:00
Brad King
335236b0cb Tests: Shorten name RunCMake.IfacePaths_{INCLUDE_DIRECTORIES => INCDIRS}
The original name was responsible for the longest path in our build
tree.  Use a shorter name to enable longer build tree names on Windows.
2019-10-01 10:53:39 -04:00
Kitware Robot
a06472b168 CMake Nightly Date Stamp 2019-10-01 00:01:08 -04:00
Brad King
d5efd8ed72 Merge branch 'release-3.15' 2019-09-30 16:37:39 -04:00
Corentin Plouet
ab06de68c5 Help: fixed typos in PCH / Unity Build doc
+ typos in source code
2019-10-01 05:33:50 +10:00
Brad King
6fb747a01c CMake 3.15.4 v3.15.4 2019-09-30 15:30:00 -04:00
Brad King
6fa2baef61 Merge branch 'release-3.14' 2019-09-30 15:05:41 -04:00
Brad King
6d01a8e004 CMake 3.14.7 v3.14.7 2019-09-30 14:01:30 -04:00
Brad King
acbe5ae049 Merge branch 'release-3.15' 2019-09-30 10:43:47 -04:00
Brad King
fcd7b53d95 Merge branch 'release-3.14' 2019-09-30 10:43:37 -04:00
Brad King
8a15e75fe3 Tests: Cover EXCLUDE_FROM_ALL OFF on sub/sub/tgt in sub/all
Issue: #19753
2019-09-30 10:34:23 -04:00
Brad King
7420843370 Makefiles: Fix EXCLUDE_FROM_ALL OFF on sub/sub/tgt in sub/all
Defer adding a test to a later commit after all generators have been
fixed.

Issue: #19753
Co-Author: Sebastian Holtermann <sebholt@xwmw.org>
2019-09-30 10:34:23 -04:00
Brad King
d713bcb642 Ninja: Factor out per-dir "all" target computation into common generator
This will make it re-usable for the Makefile generator.
2019-09-30 10:33:20 -04:00
Brad King
a75586c775 Ninja: Simplify top-level "all" target generation
Remove its dedicated implementation and update the per-directory "all"
target generation to work for the top-level directory too.
2019-09-30 10:30:28 -04:00
Brad King
a49cd4d1a7 Ninja: Fix EXCLUDE_FROM_ALL OFF on sub/sub/tgt in sub/all
Defer adding a test to a later commit after all generators have been
fixed.

Issue: #19753
2019-09-30 10:30:28 -04:00
Brad King
0733a94f64 Ninja,Makefile: Fix subdir "all" with nested EXCLUDE_FROM_ALL subdir
The "all" target defined for a subdirectory (e.g. `cd sub; make` or
`ninja sub/all`) should not include the "all" targets from nested
subdirectories (e.g. `sub/sub`) that are marked as `EXCLUDE_FROM_ALL`.
Fix this and add a test case.

Issue: #19753
Co-Author: Sebastian Holtermann <sebholt@xwmw.org>
2019-09-30 10:30:28 -04:00
Brad King
11fb377eb9 cmLocalUnixMakefileGenerator3: Mark GetRelativeTargetDirectory const 2019-09-30 10:30:28 -04:00
Brad King
be7857f40d cmLocalCommonGenerator: Mark GetConfigName as const 2019-09-30 10:30:28 -04:00
Brad King
4a92df8667 cmGlobalNinjaGenerator: Remove unused AddDependencyToAll overload 2019-09-30 10:30:28 -04:00
Brad King
e7637a3d1a Merge branch 'backport-3.15-fix-EXCLUDE_FROM_ALL-subdir-all' into release-3.15
Merge-request: !3863
2019-09-30 10:29:11 -04:00
Brad King
73dad4708f Merge branch 'backport-3.14-fix-EXCLUDE_FROM_ALL-subdir-all' into release-3.14
Merge-request: !3863
2019-09-30 10:28:20 -04:00
Brad King
8aa5f6ba44 Merge topic 'fix-EXCLUDE_FROM_ALL-subdir-all'
dce58afd30 Merge branch 'backport-3.15-fix-EXCLUDE_FROM_ALL-subdir-all'
013d7dd484 Help: Mention 3.14.7 EXCLUDE_FROM_ALL fix in 3.15.4 release note
61103c0bac Merge branch 'backport-3.14-fix-EXCLUDE_FROM_ALL-subdir-all'
1fe4501592 Help: Add release note for EXCLUDE_FROM_ALL fix in 3.15.4
05d7ca14e9 Merge branch 'backport-3.14-fix-EXCLUDE_FROM_ALL-subdir-all'
62d45d91e8 Help: Add release note for EXCLUDE_FROM_ALL fix in 3.14.7
b3b1c7bf3a Restore "all" target in subdirectories marked EXCLUDE_FROM_ALL
156b56480a Makefiles: Revert "Make build root targets ... recursive"
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3863
2019-09-30 10:27:15 -04:00
Brad King
9b03baee30 Merge topic 'objective-c-cxx'
dd0f304613 Objective C/C++: Add compiler standard detection
b515af782b Help: Add release note for Objective-C/C++ language support
9e66397c28 Languages: Add support for Objective-C++
80f120a85f Languages: Add support for Objective-C

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3811
2019-09-30 10:25:19 -04:00
Brad King
b24e501bc2 Merge topic 'autogen_free_functions'
6bd40ccf84 Autogen: Make cmQtAutoMocUic a free function
e0e9be3d57 Autogen: Make cmQtAutoRcc a free function
820962edc9 Autogen: Refactor json info file reading interface

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3867
2019-09-30 10:23:42 -04:00