mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-09 08:40:11 -06:00
Code Issues Packages Projects Releases Wiki Activity
38,204 Commits 2 Branches 390 Tags
98206571fb68881fe373c040ae703aac318fe6d7
Commit Graph

38204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Brad King
22f440ae69 Merge topic 'findmpi-notfound-spam' 
bde7513d FindMPI: Correct legacy variable handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1557
 2017-12-06 08:00:46 -05:00
Brad King
b6dd3969e8 Merge topic 'findmpi-found-cond' 
2047eb36 FindMPI: Fix multiple configure runs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1556
 2017-12-06 08:00:07 -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
KWSys Upstream
52a5c4a877 KWSys 2017-12-05 (9376537e) 
Code extracted from:

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

at commit 9376537ec0e4770a28f4b1705cfacf79650f71b6 (master).

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

Brad King (1):
      e9557f37 RegularExpression: Fix regression in 'find' method

Sebastian Holtermann (4):
      4d1e8738 RegularExpression: Make compile() reentrant (thread safe)
      64f80068 RegularExpression: Make find() reentrant (thread safe)
      bbc94ba8 RegularExpression: Remove unused code
      cff58f07 RegularExpression: New RegularExpressionMatch class
 2017-12-05 11:31:27 -05: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
Christian Pfeiffer
2047eb360d FindMPI: Fix multiple configure runs 
Due to a erroneous logical dependency on a temporary variable, FindMPI
would depend its FOUND status on the set of flags needed to support
compiler-implicit MPI support after the first configure run.

This behavior is especially causing a misreported NOT FOUND status after
the first run on MPI implementations without MPI compiler like MS-MPI or
MPICH2 on Windows.
 2017-12-05 14:17:27 +01: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
Christian Pfeiffer
bde7513d2f FindMPI: Correct legacy variable handling 
Due to a minor logic error, MPI_LIBRARY, MPI_EXTRA_LIBRARY and
MPI_<LANG>_LIBRARIES hints are currently not correctly handled and
discarded.

Additionally, if either C or CXX aren't enabled, there subsequent calls
to FindMPI will cause cache variables of the sort "MPI_MPI_EXTRA_LIBRARY-NOTFOUND"
to appear due to an error in the compatibility handling. (Doesn't affect
functionality)
 2017-12-05 14:14:40 +01: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
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
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
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