mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-13 01:39:58 -06:00
Code Issues Packages Projects Releases Wiki Activity
38,181 Commits 2 Branches 385 Tags
21541bb5ccde705afa8400a9a2b6f4454580fa5e
Commit Graph

38181 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
e841ae823e Merge topic 'add_library-mention-xcode-objlib-behavior' 
4c40ab26 add_library: mention that Xcode requires a real source file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Tom Hughes <tomtheengineer@gmail.com>
Merge-request: !1549
 2017-12-04 10:53:07 -05:00
Brad King
d5681e353a Merge topic 'pragma-once' 
4d611868 Check*: Added include guards

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1327
 2017-12-04 10:52:47 -05:00
Brad King
8c97382c8e Merge branch 'release-3.10' 2017-12-04 10:50:55 -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
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
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
Brad King
64713d4ca0 Merge branch 'cpack-pkg-fix' into release-3.10 
Merge-request: !1547
 2017-12-01 10:53:10 -05: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
Ben Boeckel
4c40ab261c add_library: mention that Xcode requires a real source file 
The docs mentioned that it happened, but not when. Mention Xcode since
it is the culprit today.

See #16524.
 2017-12-01 10:37:15 -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
KWSys Upstream
740ccb1f1d KWSys 2017-12-01 (0f0023b1) 
Code extracted from:

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

at commit 0f0023b1be404cb4a4f893c116c2f8b5190bd743 (master).

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

Brad King (1):
      7b6fa277 ConsoleBuf: Add explicit switch case fallthrough markup
 2017-12-01 08:52:29 -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
Cristian Adam
4d611868df Check*: Added include guards 2017-12-01 13:05:02 +02: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