Commit Graph

38163 Commits

Author SHA1 Message Date
Kitware Robot
bfbe4aaeb8 CMake Nightly Date Stamp 2017-12-02 00:03:10 -05:00
Brad King
a4faf86387 Merge branch 'release-3.10' 2017-12-01 08:48:59 -05:00
Brad King
a13cc4d702 Merge topic 'update-gitsetup'
5cb64508 Merge branch 'upstream-GitSetup' into update-gitsetup
f223a7ca GitSetup 2017-10-26 (1639317d)
cbd37fbe GitSetup: Restrict import to files we need

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !1543
2017-12-01 08:26:34 -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
47c326c36b Merge topic 'bootstrap-clang-5'
375eca78 bootstrap: Check support for unordered_map from compiler mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1542
2017-12-01 08:18:12 -05:00
Brad King
3c6dab8b72 Merge topic 'fix-cmake-server-bad-buffering-test'
9af5f672 test: Updated server test harness to try to cause fragmentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1508
2017-12-01 08:15:51 -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
5cb64508a3 Merge branch 'upstream-GitSetup' into update-gitsetup
* upstream-GitSetup:
  GitSetup 2017-10-26 (1639317d)
2017-11-30 14:55:34 -05:00
GitSetup Upstream
f223a7caf4 GitSetup 2017-10-26 (1639317d)
Code extracted from:

    https://gitlab.kitware.com/utils/gitsetup.git

at commit 1639317d0774f7729118138e978ca6eec9cf984e (setup).
2017-11-30 14:55:33 -05:00
Brad King
cbd37fbec3 GitSetup: Restrict import to files we need 2017-11-30 14:55:16 -05:00
Brad King
085bdf5aad Merge branch 'bootstrap-clang-5' into release-3.10
Merge-request: !1542
2017-11-30 14:02:43 -05:00
Adam Ciarciński
375eca7881 bootstrap: Check support for unordered_map from compiler mode
Some versions of clang 5 (with libc++) have a problem with
`unordered_map` under `-std=gnu++1z`:

    /usr/include/c++/__hash_table:1134:43: error: conflicting types for '__hash_table<_Tp, _Hash, _Equal, _Alloc>'

Include `unordered_map` in our test source so that we reject this
combination and fall back to an older C++ standard flag.

Fixes: #17526
2017-11-30 14:01:26 -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
KWSys Upstream
5fa414594e KWSys 2017-11-30 (fa1ab7b8)
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit fa1ab7b8d790498359ab1b1bff522a7401a918fc (master).

Upstream Shortlog
-----------------

Brad King (1):
      1b09cf0d Configure: Add KWSYS_FALLTHROUGH macro for C++ code
2017-11-30 08:52:44 -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
c2ea729c87 Merge topic 'CMakeFindBinUtils-improve-switch'
acb4cb95 CMakeFindBinUtils: Improve switch between MSVC- and GNU-like tools

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1533
2017-11-30 07:58:15 -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
Brad King
21806e6f5f Merge topic 'findcuda-separable-compilation-fix'
3726ded1 FindCUDA: Add cublas device library to separable compilation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1446
2017-11-30 07:55:59 -05:00
Brad King
eee4124f3a Merge topic 'findiconv-module'
95646591 FindIconv: Add the FindIconv module.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1530
2017-11-30 07:55:24 -05:00
Brad King
c5fdd66252 Merge topic 'CheckIncludeFiles-fix-src-name'
3eee3301 CheckIncludeFiles: Fix name of source file used for check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1538
2017-11-30 07:42:45 -05:00
Brad King
3eee33012e CheckIncludeFiles: Fix name of source file used for check
In commit 7669695a74 (CheckIncludeFiles: extend to allow a LANGUAGE
argument, 2017-11-08) the file name used for the check was accidentally
left as `${var}.c`, where `var` is not a variable we define.  It was
passing tests by accidentally using just `.c` as the file name, but can
break in real projects that may leave `var` defined to something else.
The reference was taken from similar code in CheckTypeSize where the
variable names are different.  Fix our reference to be `${VARIABLE}`.
2017-11-30 07:37:35 -05:00
Kitware Robot
868fdb439a CMake Nightly Date Stamp 2017-11-30 00:01:14 -05:00
Justin Berger
1e9b7d3ceb server: Switched to a auto model for handles 2017-11-29 16:36:31 -05:00
Justin Berger
f43b9219c7 tests: Added tests to verify UV RAII semantics/constructs 2017-11-29 16:36:31 -05:00
Justin Berger
a3abb85c6f Add RAII handles for libuv handle types
The `uv_*_t` handle types are closed by `uv_close`, but the semantics
are tricky.  Calling `uv_close` may not close immediately.  Instead it
hands ownership to the uv loop to which the handle is currently
attached.  When the loop decides to close it, a callback is used to
allow the `uv_close` caller to free resources.

Provide an abstraction layer as `cm::uv_*_ptr` types corresponding to
the `uv_*_t` handle types.  Each pointer is either empty (`nullptr`)
or has an initialized handle attached to a loop.  Use move semantics
to ensure a single owner of the handle so that clients can predict
when the handle is destroyed.
2017-11-29 16:36:31 -05:00
Justin Berger
90f8db269f tests: unconditionally enabled server tests 2017-11-29 16:36:31 -05:00
Justin Berger
b56b51fcaf utility: Disabled copy ctors in thread classes 2017-11-29 16:36:31 -05:00
Craig Scott
b311b87518 Merge topic 'check_fixtures_before_exe_existence'
fbe91dba CTest: Check failed fixture dependencies before test command and args

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !1526
2017-11-29 15:09:58 -05:00
Justin Berger
9af5f67277 test: Updated server test harness to try to cause fragmentation 2017-11-29 12:35:42 -07:00
Jamil Appa
3726ded116 FindCUDA: Add cublas device library to separable compilation
Add cublas libraries to separable compilation device link line to
resolve missing symbols when using cublas device library.
2017-11-29 11:44:42 -05:00
Deniz Bahadir
b0e2f1415e target_link_libraries: Slightly fix some error-messages.
Some error-messages are slightly adjusted to better tell what
invocation would be correct instead. Tests are adjusted accordingly.
2017-11-29 17:01:47 +01:00
Deniz Bahadir
85457b63c8 target_link_libraries: Return earlier on some error. 2017-11-29 17:00:56 +01:00
Christian Pfeiffer
95646591d6 FindIconv: Add the FindIconv module.
This module provides abstraction over the various ways POSIX platforms
handle the iconv calls defined in POSIX.1-2001 and later versions.
2017-11-29 14:51:32 +01:00
Brad King
5def40891f Merge branch 'release-3.10' 2017-11-29 08:40:00 -05:00
Brad King
c07b18d883 Merge topic 'CodeBlocks-custom-compiler-id'
e04f1d1b CodeBlocks: add option for the CB compiler ID

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1512
2017-11-29 08:32:26 -05:00
Brad King
71c28bddba Merge topic 'aix-threads'
4ff89fb6 AIX: Add -pthread flag to enable std::thread with GCC
6e613ff3 bootstrap: Add infrastructure to detect threading flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1535
2017-11-29 08:32:00 -05:00
Brad King
d5cad74078 Merge topic 'clang-cl-fix'
f969f1a9 Clang: Do not mistake clang-cl 6.0 for GNU-like clang

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1522
2017-11-29 08:29:36 -05:00
Brad King
caffddd620 Merge topic 'CheckIncludeFiles-language-CXX'
b31d5e1d CheckIncludeFiles: improve warning for missing argument
1f1c2a9f CheckIncludeFiles: clean up documentation of new features
c8609992 Help: Add notes for topic 'CheckIncludeFiles-language-CXX'
ea1bb902 CheckIncludeFiles: add unit tests
7669695a CheckIncludeFiles: extend to allow a LANGUAGE argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1464
2017-11-29 08:26:05 -05:00
Brad King
9e961930ee Merge topic 'win-clang-debug'
458c589f FindBoost: Add Windows ABI tag for Clang debug
00e39a4a FindBoost: Use CMAKE_CXX_COMPILER_ID for Intel compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1529
2017-11-29 08:23:11 -05:00