Commit Graph

23861 Commits

Author SHA1 Message Date
Brad King 9accb48d17 Merge topic 'revert-server-target-backtraces'
b7100756 Merge branch 'backport-revert-server-target-backtraces' into revert-server-target-backtraces
976370d1 server: drop "ctestInfo" backtrace information
8b2736c7 server: Revert "Report backtraces in codemodel response"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1564
2017-12-07 08:08:59 -05:00
Kitware Robot f5e48edaae CMake Nightly Date Stamp 2017-12-07 00:01:14 -05:00
Brad King b7100756d7 Merge branch 'backport-revert-server-target-backtraces' into revert-server-target-backtraces 2017-12-06 11:49:52 -05:00
Brad King 976370d134 server: drop "ctestInfo" backtrace information
Backtrace information was included by commit 35a52bd1b4 (server: add
"ctestInfo" request to get test info, 2017-10-25) to match that already
provided for targets.  However, the backtrace representation uses too
much memory and needs to be dropped.  Remove it from test information.

Issue: #17502
2017-12-06 11:45:51 -05:00
Brad King 8b2736c71c server: Revert "Report backtraces in codemodel response"
The backtrace information is very repetitive and hugely increases the
size of the codemodel object.  We need to remove it until an alternative
representation can be developed.  Revert commit v3.10.0-rc1~393^2
(server: Report backtraces in codemodel response, 2017-06-20), except
for the protocol version number (because it indicates other new things).

Unfortunately this is incompatible with clients that expect the
"crossReferences" field in targets.  However, the regression in memory
usage is quite serious, especially on large projects, and therefore
breaks even older clients that do not use backtraces.  Since the
"crossReferences" field was only provided by one release (3.10.0), it is
simplest to revert it outright for 3.10.1.

Fixes: #17502
2017-12-06 11:39:03 -05:00
Brad King 060cf73ec8 Merge topic 'src-COMPILE_DEFINITIONS-genex'
9432f686 Add generator expression support to per-source COMPILE_DEFINITIONS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1546
2017-12-06 08:05:31 -05:00
Brad King 98206571fb Merge topic 'update-kwsys'
79b241de cmake-gui: Update RegexExplorer for changes to KWSys
4a8bbc52 Merge branch 'upstream-KWSys' into update-kwsys
52a5c4a8 KWSys 2017-12-05 (9376537e)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1558
2017-12-06 08:01:20 -05:00
Kitware Robot a442624def CMake Nightly Date Stamp 2017-12-06 00:01:25 -05:00
Brad King 79b241dee0 cmake-gui: Update RegexExplorer for changes to KWSys 2017-12-05 11:32:08 -05:00
Brad King 4a8bbc520a Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2017-12-05 (9376537e)
2017-12-05 11:31:27 -05:00
Marc Chevrier 9432f686e6 Add generator expression support to per-source COMPILE_DEFINITIONS
This allows users to specify different genex-based compile definitions for each file in a target.

Fixes: #17508
2017-12-05 14:47:39 +01:00
Brad King d06b826421 Merge topic 'update-cm-thread'
3519c8f2 utilities: Swapped to use std C++11 mutex/threading constructs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1551
2017-12-05 08:18:13 -05:00
Brad King 83068cb1ed Merge topic 'include_external_ms_project_support_non_windows_target'
2c06e9e7 include_external_msproject: Support non-Windows target platforms
c89e8522 cmGlobalGenerator: Add IsIncludeExternalMSProjectSupported method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1525
2017-12-05 08:17:30 -05:00
Brad King 729dda5420 Merge topic 'src-genex-refactoring'
6bffc13e Refactor per-source generator expression evaluation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1550
2017-12-05 08:15:40 -05:00
Brad King 0236e50802 Merge topic 'update-cpplint'
bfcc2034 Update cpplint support to return 0 and mark warnings for CDash.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1544
2017-12-05 08:14:39 -05:00
Brad King 0b7822f49a Merge topic 'win-fallthrough'
21541bb5 Use CM_FALLTHROUGH in Windows-specific code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1555
2017-12-05 08:13:34 -05:00
Brad King b8e7af979d Merge topic 'ctest-chrono'
66419bc0 CTest: convert timeouts to std::chrono::duration
923b8fad IWYU: Add mappings for std::enable_if on chrono durations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1513
2017-12-05 08:12:52 -05:00
Kitware Robot 8616e9ba24 CMake Nightly Date Stamp 2017-12-05 00:01:13 -05:00
Tomoki Imai 2c06e9e73e include_external_msproject: Support non-Windows target platforms
Allow the command on any generator that supports it, even if
the target platform does not define `WIN32`.

Fixes: #17511
2017-12-04 11:23:38 -05:00
Tomoki Imai c89e8522bb cmGlobalGenerator: Add IsIncludeExternalMSProjectSupported method 2017-12-04 11:21:43 -05:00
Brad King 21541bb5cc Use CM_FALLTHROUGH in Windows-specific code
Some cases were missed by earlier sweeps due to not compiling
Windows-specific code.
2017-12-04 10:58:15 -05:00
Brad King d8290531a9 Merge topic 'cpack-pkg-fix'
f25d87db CPack: Fix macOS PKG component dependency information

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1547
2017-12-04 10:50:33 -05:00
Brad King caa1c4967a Merge topic 'csharp_project_without_sources'
8e654a37 VS: Enable generation of CSharp projects without initial .cs files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1521
2017-12-04 10:48:53 -05:00
Brad King 411397f913 Merge topic 'update-kwsys'
be8ec418 Merge branch 'upstream-KWSys' into update-kwsys
740ccb1f KWSys 2017-12-01 (0f0023b1)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1548
2017-12-04 10:46:36 -05:00
Wouter Klouwen 66419bc046 CTest: convert timeouts to std::chrono::duration
This commit continues the refactoring of CTest to adopt std::chrono.
After the last sets of changes that introduced std::chrono::steady_clock
and std::chrono::system_clock respectively, it makes sense to have all
the timeouts be stored as std::chrono::duration.

No functional change intended.
2017-12-04 10:43:14 -05:00
Brad King 5f87ea1603 Merge topic 'cmake-job-pool'
07185055 Ninja: add CMAKE_JOB_POOLS variable as default for JOBS_POOLS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1514
2017-12-04 10:38:51 -05:00
Marc Chevrier 6bffc13ef1 Refactor per-source generator expression evaluation
Prepare to add generator expression support to more source properties.
Factor out some duplicated code into a helper to avoid further
duplication.
2017-12-04 09:10:09 -05:00
Kitware Robot 7f881d159c CMake Nightly Date Stamp 2017-12-04 00:01:08 -05:00
Kitware Robot 2f8711d958 CMake Nightly Date Stamp 2017-12-03 00:01:17 -05:00
Kitware Robot bfbe4aaeb8 CMake Nightly Date Stamp 2017-12-02 00:03:10 -05:00
Bill Hoffman bfcc20343c Update cpplint support to return 0 and mark warnings for CDash.
This commit makes cpplint act like the other compiler mirroring tools. It
will always return 0 even if it reports warnings and will only return non
zero if there is a problem running the command. In addition, it will now
add some extra text to allow CTest to recognize the warnings and report
them correctly to CDash.
2017-12-01 16:23:45 -05:00
Justin Berger 3519c8f247 utilities: Swapped to use std C++11 mutex/threading constructs 2017-12-01 12:09:51 -07:00
Alexander Wittig f25d87db9e CPack: Fix macOS PKG component dependency information
Refactoring in commit v3.7.0-rc1~523^2 (CPack/PackageMaker: port to
cmXMLWriter, 2016-06-08) accidentally broke `distribution.dist`
generation when there are dependencies between components and the pkg
(or the derived productbuild) generator are used.  The resulting
package cannot be installed and instead the Apple Installer app
shows a "Javascript error" message.

The problem is that a `std::ostringstream` is constructed with some
content, but the stream pointer still points to the beginning of the
stream, so subsequent writes overwrite the initial content instead of
appending.
2017-12-01 10:52:55 -05:00
Brad King be8ec41896 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2017-12-01 (0f0023b1)
2017-12-01 08:52:33 -05:00
Brad King 22e67bc6bb Merge topic 'simplify_target_link_libraries'
8112059e target_link_libraries: Simplify implementation and add comments.
b0e2f141 target_link_libraries: Slightly fix some error-messages.
85457b63 target_link_libraries: Return earlier on some error.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1531
2017-12-01 08:24:08 -05:00
Brad King e61c1cf64c Merge topic 'libuv-raii'
3bcaa870 cmUVHandlePtr: Add uv_process_ptr
dd700e9b cmUVHandlePtr: Add uv_timer_ptr
32cfa7b3 cmUVHandlePtr: Move to CMakeLib to make it available everywhere

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1541
2017-12-01 08:22:49 -05:00
Brad King 006a4956a2 Merge topic 'fixCMakeVersionRC'
4a3c19a5 Windows: Fix version embedding in CMake binaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1536
2017-12-01 08:11:07 -05:00
Brad King 4d0bcc94c4 Merge topic 'simplify-fallthrough'
b2f612a0 Simplify CM_FALLTHROUGH implementation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1540
2017-12-01 08:04:21 -05:00
Brad King 340fae777a Merge topic 'update-kwsys'
d094b679 Merge branch 'upstream-KWSys' into update-kwsys
5fa41459 KWSys 2017-11-30 (fa1ab7b8)
a3e029ef cmStandardLexer.h: Do not include a C++ header

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1539
2017-12-01 08:03:53 -05:00
Kitware Robot 6287365ab0 CMake Nightly Date Stamp 2017-12-01 00:01:20 -05:00
Brad King 3bcaa87007 cmUVHandlePtr: Add uv_process_ptr 2017-11-30 13:43:43 -05:00
Brad King dd700e9bfb cmUVHandlePtr: Add uv_timer_ptr 2017-11-30 13:26:35 -05:00
Deniz Bahadir 8112059ee7 target_link_libraries: Simplify implementation and add comments.
The implementation of `target_link_libraries` did grow over the years
when new features where added. This commit cleans up the implementation
and adds comments to better document its intention.

The behavior of `target_link_libraries` itself is left untouched.
2017-11-30 17:35:25 +01:00
Brad King 32cfa7b324 cmUVHandlePtr: Move to CMakeLib to make it available everywhere 2017-11-30 11:19:31 -05:00
Brad King 92b212e875 Merge topic 'libuv-raii'
1e9b7d3c server: Switched to a auto model for handles
f43b9219 tests: Added tests to verify UV RAII semantics/constructs
a3abb85c Add RAII handles for libuv handle types
90f8db26 tests: unconditionally enabled server tests
b56b51fc utility: Disabled copy ctors in thread classes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1453
2017-11-30 10:57:52 -05:00
Justin Goshi 4a3c19a583 Windows: Fix version embedding in CMake binaries
In commit 5b9da05b7a (Windows: Embed version information into CMake
binaries, 2017-10-25) we left out `<winres.h>` since MinGW does not have
the header, but it is needed for the `VS_VERSION_INFO` macro.  Provide
the macro ourselves.

Suggested-by: Christian Pfeiffer <cpfeiffer@live.de>
2017-11-30 10:42:26 -05:00
Brad King b2f612a0fa Simplify CM_FALLTHROUGH implementation
Use the macro now provided by KWSys instead of using `try_compile`
checks.  It will no longer consider the `__attribute__((fallthrough))`
variant, but compilers that don't have one of the modern attributes
shouldn't warn about not using one anyway.
2017-11-30 09:50:39 -05:00
Brad King d094b6796a Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2017-11-30 (fa1ab7b8)
2017-11-30 08:52:45 -05:00
Brad King a3e029effd cmStandardLexer.h: Do not include a C++ header
This header is meant for inclusion in lexer `.c` files.
2017-11-30 08:46:06 -05:00
Brad King 5d43e46ad5 Merge topic 'whitelist-more-interface-properties'
fb3c5bfd cmTargetPropertyComputer: whitelist custom properties

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1515
2017-11-30 07:57:08 -05:00