mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-06 23:29:31 -06:00
Code Issues Packages Projects Releases Wiki Activity
38,292 Commits 2 Branches 390 Tags
e9fcd1545facf6300181db843260008e1069c7b4
Commit Graph

38292 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Holtermann
e9fcd1545f Autogen: Tests: Separate RerunMocPlugin test 2017-12-13 13:50:18 +01:00
Sebastian Holtermann
54b4ff2aee Autogen: Tests: Separate RerunMocBasic test 2017-12-13 13:50:18 +01:00
Sebastian Holtermann
4988746e76 Autogen: Tests: Separate Complex test 2017-12-13 13:50:18 +01:00
Sebastian Holtermann
6ce6fd426e Autogen: Tests: Separate StaticLibraryCycle test 2017-12-13 13:50:18 +01:00
Sebastian Holtermann
45b6776ab3 Autogen: Tests: Separate SameName test 2017-12-13 13:50:18 +01:00
Sebastian Holtermann
d7868687c8 Autogen: Tests: Separate MacOsFW test 2017-12-13 13:50:18 +01:00
Sebastian Holtermann
b8ef28ae1f Autogen: Tests: Separate ObjectLibrary test 2017-12-13 13:50:18 +01:00
Sebastian Holtermann
0b6ad59ea6 Autogen: Tests: Separate UicInclude test 2017-12-13 13:50:18 +01:00
Sebastian Holtermann
a2c4e3489d Autogen: Tests: Separate MocCMP0071 test 2017-12-13 13:50:17 +01:00
Sebastian Holtermann
cc66d35651 Autogen: Tests: Separate MocInclude test 2017-12-13 13:50:17 +01:00
Sebastian Holtermann
7971202b3c Autogen: Tests: Separate MocDepends test 2017-12-13 13:48:28 +01:00
Sebastian Holtermann
fb7e52ca3d Autogen: Tests: Separate MocMacroName test 2017-12-13 13:48:28 +01:00
Sebastian Holtermann
5cab8c307c Autogen: Tests: Separate RccSkipSource test 2017-12-13 13:48:28 +01:00
Sebastian Holtermann
f11321efd1 Autogen: Tests: Separate UicSkipSource test 2017-12-13 13:48:28 +01:00
Sebastian Holtermann
0af9da29e4 Autogen: Tests: Separate MocSkipSource test 2017-12-13 13:48:28 +01:00
Sebastian Holtermann
f658bdaa7c Autogen: Tests: Separate RccOffMocLibrary test 2017-12-13 13:48:28 +01:00
Sebastian Holtermann
f00e6c7c70 Autogen: Tests: Separate RccOnly and RccEmpty tests 2017-12-13 13:48:28 +01:00
Sebastian Holtermann
6273b83549 Autogen: Tests: Separate uicOnly test 2017-12-13 13:48:27 +01:00
Sebastian Holtermann
0b8597a86e Autogen: Tests: Separate mocOnly and mocOnlyOpts tests 2017-12-13 13:48:27 +01:00
Sebastian Holtermann
227a7974f4 Autogen: Tests: Add basic scripts for separate tests 2017-12-13 13:48:27 +01:00
Brad King
bd10c3cf82 Merge branch 'release-3.10' 2017-12-12 08:04:19 -05:00
Brad King
77aab3e515 Merge topic 'FindPkgConfig_doc_cleanup' 
adf49137 FindPkgConfig: Cleanup docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1584
 2017-12-12 08:03:57 -05:00
Brad King
57199deafa Merge topic 'fix-iar-binutils-for-cxx' 
e4707048 IAR: FindBinUtils should work for CXX as well as C

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1572
 2017-12-12 08:02:55 -05:00
Brad King
1f5b2a8de9 Merge topic 'fix-ctest-chrono' 
ba6caafa CTest: Use integer-representable value for "infinite" timeout
548e8f6f CTest: Simplify std::chrono::duration<double> conversion to double
de0035fd cmCTestBuildAndTestHandler: Convert timeout to std::chrono::duration
687a26b7 CTest: Fix regression in build-and-test timeout forwarding
e770b1b8 CTest: Fix regression in build-and-test timeout compuatation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: dublet <github@dublet.org>
Merge-request: !1574
 2017-12-12 08:02:33 -05:00
Brad King
e2303b257c Merge branch 'fix-iar-binutils-for-cxx' into release-3.10 
Merge-request: !1572
 2017-12-12 08:00:44 -05:00
Islam Amer
e4707048c0 IAR: FindBinUtils should work for CXX as well as C 
The IAR compiler test works when a project specifies LANGUAGES C CXX
but fails if CXX comes before C. This change makes it work regardless
of the order.
 2017-12-12 08:00:16 -05:00
Kitware Robot
62d8bff146 CMake Nightly Date Stamp 2017-12-12 00:01:15 -05:00
Brad King
ba6caafa42 CTest: Use integer-representable value for "infinite" timeout 
Refactoring in commit 66419bc046 (CTest: convert timeouts to
std::chrono::duration, 2017-11-20) changed out "infinite" timeout to a
value not representable by a 64-bit integer.  This causes undefined
behavior when e.g. KWSys Process converts the duration to a `long` to
interact with system APIs.  Use the old `1.0e7` maximum value.
 2017-12-11 10:41:48 -05:00
Brad King
9720c14255 Merge topic 'cpack-generator-scripts-enable-all-cmake-policies' 
93d5f464 CPack: enable all CMake policies for generator scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1582
 2017-12-11 09:00:19 -05:00
Brad King
0f57e15157 Merge topic 'ctest-remove-unfinished-batch-mode' 
f984296b CTest: Remove unfinished batch test mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1577
 2017-12-11 08:33:58 -05:00
Brad King
1efb6e566f Merge topic 'update-kwsys' 
9dee52ba Merge branch 'upstream-KWSys' into update-kwsys
3b1bb703 KWSys 2017-12-08 (2d27b1d0)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1576
 2017-12-11 08:33:25 -05:00
Kitware Robot
14fe6d431b CMake Nightly Date Stamp 2017-12-11 00:01:09 -05:00
Craig Scott
adf4913795 FindPkgConfig: Cleanup docs 
- Moved block of misplaced comments to correct section
- Improved grammar, readability and consistency
- Updated to conform to style guidelines
 2017-12-10 22:50:39 +11:00
Kitware Robot
ec37222d59 CMake Nightly Date Stamp 2017-12-10 00:01:10 -05:00
Domen Vrankar
93d5f464cc CPack: enable all CMake policies for generator scripts 2017-12-09 12:50:28 +01:00
Kitware Robot
0fe1966b79 CMake Nightly Date Stamp 2017-12-09 00:01:30 -05:00
Brad King
f984296ba8 CTest: Remove unfinished batch test mode 
This was partially implemented by commit v2.8.0~154 (Added some ctest
batch capabilities, 2009-09-10) but never finished.
 2017-12-08 11:23:33 -05:00
Brad King
548e8f6ffe CTest: Simplify std::chrono::duration<double> conversion to double 
The ratio of ticks to seconds for this type is 1, so we can just use its
`count()` directly.  This also avoids converting through the integer
representation of `std::chrono::milliseconds`, which has a much smaller
allowed range.

Drop our `cmsysProcess_SetTimeout` wrapper as it is now very thin.
 2017-12-08 11:09:49 -05:00
Brad King
9dee52baca Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-12-08 (2d27b1d0)
 2017-12-08 10:08:39 -05:00
KWSys Upstream
3b1bb703a2 KWSys 2017-12-08 (2d27b1d0) 
Code extracted from:

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

at commit 2d27b1d075d93860ee63564f635fd1710aa61208 (master).

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

Brad King (1):
      9995f700 hashtable: Drop when building inside CMake
 2017-12-08 10:08:38 -05:00
Brad King
d25bcab161 Merge branch 'release-3.10' 2017-12-08 09:55:12 -05:00
Brad King
3efc6ad2a2 Merge branch 'cuda_darwin_proper_install_names_flags' into release-3.10 
Merge-request: !1570
 2017-12-08 09:54:31 -05:00
Brad King
e81b7a2075 Merge topic 'cuda_darwin_proper_install_names_flags' 
ce3874b3 CUDA: Shared libraries on Darwin properly setup @rpath install_names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1570
 2017-12-08 09:53:33 -05:00
Brad King
62822ce68a Merge branch 'release-3.10' 2017-12-08 09:36:12 -05:00
Brad King
158fb9755c Merge topic 'autogen-fix-library-deps' 
1bc60334 Merge branch 'automoc-apple-framework' into autogen-fix-library-deps
a3f8371c Merge branch 'automoc-apple-framework' into autogen-fix-library-deps
bd49ae51 Autogen: Fix library dependency forwarding to _autogen target
e4ccc684 Autogen: Tests: Add test for MacOS frameworks
fcbd02fd Autogen: Fix for AUTOMOC on macOS frameworks in CMake 3.10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1566
 2017-12-08 09:35:02 -05:00
Brad King
bbac777698 Merge topic 'update-kwsys' 
c50f08cd Merge branch 'upstream-KWSys' into update-kwsys
5b1c84b4 KWSys 2017-12-07 (4aee0036)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1567
 2017-12-08 09:12:54 -05:00
Brad King
de0035fdcc cmCTestBuildAndTestHandler: Convert timeout to std::chrono::duration 2017-12-08 08:31:00 -05:00
Brad King
687a26b702 CTest: Fix regression in build-and-test timeout forwarding 
Refactoring in commit 66419bc046 (CTest: convert timeouts to
std::chrono::duration, 2017-11-20) changed out "infinite" timeout
to a value not representable by a 64-bit integer.  Update the
`--build-and-test` forwarding of `--test-timeout` to not forward
an "infinite" timeout.
 2017-12-08 07:33:39 -05:00
Brad King
e770b1b86e CTest: Fix regression in build-and-test timeout compuatation 
Refactoring in commit 66419bc046 (CTest: convert timeouts to
std::chrono::duration, 2017-11-20) accidentally changed the logic used
to compute the timeout for a test when it starts.  It incorrectly limits
the maximum possible timeout to 2 minutes rather than 2 minutes less
than the total allowed test time remaining.  Update the new logic to
restore the original behavior.

Avoid subtracting 2 minutes from our "infinite" timeout value to avoid
creating very large timeouts that are not "infinite" and may exceed
integer type ranges.
 2017-12-08 07:14:05 -05:00
Kitware Robot
1c40558e91 CMake Nightly Date Stamp 2017-12-08 00:01:12 -05:00