mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-19 21:50:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
38,294 Commits 2 Branches 391 Tags
1e148aba7078359e2e5b4d7080a6e1cb6592d94a
Commit Graph

38294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
1e148aba70 Merge topic 'cmGraphVizWriter_Interface_Dependers' 
9b4d31dc cmGraphVizWriter: Updated to create and follow dependers for interface targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1581
 2017-12-14 08:08:05 -05:00
Joel T. Frederico
9b4d31dc77 cmGraphVizWriter: Updated to create and follow dependers for interface targets 
Generating graphs of dependencies now uses interface targets, but graphs
of dependers did not include interface targets.
 2017-12-14 08:03:02 -05:00
Kitware Robot
1e2911b8cd CMake Nightly Date Stamp 2017-12-14 00:01:11 -05:00
Brad King
e80cc856da Merge branch 'release-3.10' 2017-12-13 09:15:08 -05:00
Brad King
166bf4c490 CMake 3.10.1 v3.10.1 2017-12-13 08:34:28 -05:00
Brad King
3fdc4397e1 Merge branch 'release-3.10' 2017-12-13 08:03:05 -05:00
Brad King
a363c9356d Merge topic 'findmpi-builtin-fix' 
d1d8719f FindMPI: Fix various legacy problems

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1569
 2017-12-13 07:52:54 -05:00
Brad King
f0b3fab179 Merge topic 'irsl-msvc-omp-fix' 
4dae55fb IRSL: Fix MSVC variable deferencing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1588
 2017-12-13 07:50:52 -05:00
Brad King
95e86eafd7 Merge topic 'FindPerlLibs-MacOS-failure' 
a6005371 FindPerlLibs: Add support for MSYS and CYGWIN
362a1f33 FindPerlLibs: refactoring
c365a078 FindPerlLibs: fix MacOS failure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1586
 2017-12-13 07:50:02 -05:00
Brad King
3395aec7b8 Merge topic 'use-std-string' 
c62ffdcd cmIDEOptions: use std::string instead of const char*

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1580
 2017-12-13 07:49:18 -05:00
Brad King
372dc9b087 Merge topic 'update-kwsys' 
834d1878 Merge branch 'upstream-KWSys' into update-kwsys
c6a83ecf KWSys 2017-12-12 (3ba214b7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1587
 2017-12-13 07:48:29 -05:00
Kitware Robot
c97734280f CMake Nightly Date Stamp 2017-12-13 00:01:27 -05:00
Brad King
38b4209100 Merge branch 'irsl-msvc-omp-fix' into release-3.10 
Merge-request: !1588
 2017-12-12 09:33:10 -05:00
Brad King
19d5969d37 Merge branch 'findmpi-builtin-fix' into release-3.10 
Merge-request: !1569
 2017-12-12 09:31:18 -05:00
Christian Pfeiffer
4dae55fb70 IRSL: Fix MSVC variable deferencing 
Fixes: #17529
 2017-12-12 15:16:38 +01:00
Christian Pfeiffer
d1d8719f62 FindMPI: Fix various legacy problems 
This MR fixes a number of bugs stemming from legacy variable handling,
partially introduced by commit v3.10.0-rc1~103^2 (FindMPI: Add support
for FreeBSD and SLES, 2017-08-09).

* `MPI_COMPILE_OPTIONS` and `MPI_COMPILE_DEFINITIONS` legacy hints were not passed correctly.
* Legacy variables could be parsed after they were set by `FindMPI` cause erroneous hinting on subsequent runs.
* In the case of the compiler supporting MPI implicitly:
	* not all consumption variables would be correctly reset.
	* `MPI_<LANG>_HEADER_DIR` would be set unintentionally.
	* `MPI_<LANG>_LIB_NAMES` appeared in cache despite being ignored.
	* on subsequent passes, `MPI_<LANG>_COMPILER` could be corrupted.
* the C-to-CXX copy logic would take place even if `MPI_SKIP_GUESSING` was turned on
* if only some language compilers were given, inconsistent search behavior could be observed

Issue: #17538
 2017-12-12 14:20:02 +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
Brad King
834d187841 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-12-12 (3ba214b7)
 2017-12-12 07:51:51 -05:00
KWSys Upstream
c6a83ecf17 KWSys 2017-12-12 (3ba214b7) 
Code extracted from:

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

at commit 3ba214b7963fdd59f6f230c100550f9c5aa3deab (master).

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

Gregor Jasny (1):
      8e029751 SystemTools: Fix IsSubDirectory for subdirs of drive root
 2017-12-12 07:51:50 -05:00
Marc Chevrier
a6005371b0 FindPerlLibs: Add support for MSYS and CYGWIN 2017-12-12 11:42:28 +01:00
Marc Chevrier
362a1f336d FindPerlLibs: refactoring 
Use a dedicated function (perl_get_info) to retrieve various configuration information
 2017-12-12 09:41:16 +01:00
Marc Chevrier
c365a07870 FindPerlLibs: fix MacOS failure 
Fix library paths computation on MacOS

Fixes: #12544
 2017-12-12 09:38:39 +01: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
Vitaly Stakhovsky
c62ffdcd4f cmIDEOptions: use std::string instead of const char* 
Revise method signatures to save a few c_str() conversions.
 2017-12-08 22:30:16 -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