mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-03 12:49:50 -05:00
Code Issues Packages Projects Releases Wiki Activity
38,225 Commits 2 Branches 401 Tags
3de52db69cc0c9568067c02492eddf5396147e0c
Commit Graph

38225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 3de52db69c Merge topic 'splitRCPatchComponent' 
f92304c7 CMakeVersion RC file: Split patch into 2 components

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1552
 2017-12-07 08:11:56 -05:00
Brad King ffc9c89dae Merge branch 'release-3.10' 2017-12-07 08:09:37 -05:00
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
Brad King ea63c522ef Merge topic 'gtest-discovery-timeout' 
935848a8 GoogleTest: Add test for missing test executable
29731d89 GoogleTest: Add timeout to discovery
e99e3982 GoogleTest: Improve gtest_discover_tests messages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1534
 2017-12-07 08:06:27 -05:00
Brad King afae027d63 Merge branch 'gtest-discovery-timeout' into release-3.10 
Merge-request: !1534
 2017-12-07 08:03:11 -05:00
Kitware Robot f5e48edaae CMake Nightly Date Stamp 2017-12-07 00:01:14 -05:00
Brad King 05f86af716 Merge branch 'backport-revert-server-target-backtraces' into release-3.10 
Merge-request: !1564
 2017-12-06 13:46:55 -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 92910e282a Merge branch 'release-3.10' 2017-12-06 08:07:37 -05:00
Brad King dd792b08b5 Merge topic 'doc-lang-order' 
6ecd8b60 Help: Document that ASM should be enabled last

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1560
 2017-12-06 08:06:33 -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
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
Matthew Woehlke 935848a8a7 GoogleTest: Add test for missing test executable 
Add a test to verify expected behavior when a test executable on which
gtest_discover_tests is invoked was not built. (The test for the newly
added timeout conveniently sets up this situation, so this new test was
almost trivial to add.)
 2017-12-06 07:37:48 -05:00
Matthew Woehlke 29731d8919 GoogleTest: Add timeout to discovery 
Add a TIMEOUT option to gtest_discover_tests. This provides a
work-around in case a test goes out to lunch, rather than causing the
build to simply hang. (Although this is still a problem with the user's
project, hanging the build is not cool, especially in the case of
automatically running CI builds. It is much preferred that the build
should actively fail in this case, and it is trivially easy for us to
implement that.)
 2017-12-06 07:37:48 -05:00
Brad King 6ecd8b601b Help: Document that ASM should be enabled last 
ASM should be enabled after C and/or CXX because we consider the
compilers for those languages as possible assemblers.

Issue: #17532
 2017-12-06 06:48:06 -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
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 0418e91f7d Merge branch 'findmpi-notfound-spam' into release-3.10 
Merge-request: !1557
 2017-12-05 08:37:10 -05:00
Brad King 64184762f4 Merge branch 'findmpi-found-cond' into release-3.10 
Merge-request: !1556
 2017-12-05 08:36:52 -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
Justin Goshi f92304c789 CMakeVersion RC file: Split patch into 2 components 
The binary file version has 4 16-bit components. In cases where the
patch component is too large (ex: represents a build date yyyymmdd) we
split it into two parts.
 2017-12-04 10:49:39 -08: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