mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-26 08:08:24 -05:00
Code Issues Packages Projects Releases Wiki Activity
38,323 Commits 2 Branches 401 Tags
0d1b6c89dcefa4d2d690d5ed030022c82b5503bd
Commit Graph

38323 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 0d1b6c89dc Merge branch 'release-3.10' 2017-12-14 08:39:55 -05:00
Brad King 4bc5c08476 Merge topic 'per-source-COMPILE_LANGUAGE-genex-support' 
10f58b27 Genex: Per-source $<COMPILE_LANGUAGE:...> support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1575
 2017-12-14 08:21:52 -05:00
Brad King 7341930ade Merge topic 'autogen-separate-tests' 
540d08f4 Autogen: Tests: Move QtAutoUicInterface test to QtAutogen/UicInterface
b1504f9f Autogen: Tests: Separate RerunRccDepends test
e9fcd154 Autogen: Tests: Separate RerunMocPlugin test
54b4ff2a Autogen: Tests: Separate RerunMocBasic test
4988746e Autogen: Tests: Separate Complex test
6ce6fd42 Autogen: Tests: Separate StaticLibraryCycle test
45b6776a Autogen: Tests: Separate SameName test
d7868687 Autogen: Tests: Separate MacOsFW test
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1578
 2017-12-14 08:21:28 -05:00
Brad King 671958d288 Merge topic 'irsl-intel-fortran-only-fix' 
7d1ed84c IRSL: Skip libgfxoffload if no Intel C++ is used

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1589
 2017-12-14 08:18:53 -05:00
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
Brad King 307214c0ee Merge branch 'cmGraphVizWriter_Interface_Dependers' into release-3.10 
Merge-request: !1581
 2017-12-14 08:06:56 -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
Marc Chevrier 10f58b27ac Genex: Per-source $<COMPILE_LANGUAGE:...> support 
Fixes: #17542
 2017-12-13 16:35:22 +01: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
Sebastian Holtermann 540d08f485 Autogen: Tests: Move QtAutoUicInterface test to QtAutogen/UicInterface 2017-12-13 13:50:19 +01:00
Sebastian Holtermann b1504f9f97 Autogen: Tests: Separate RerunRccDepends test 2017-12-13 13:50:18 +01:00
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
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
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
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 7d1ed84cea IRSL: Skip libgfxoffload if no Intel C++ is used 
`libgfxoffload` is only used and installed by the Intel C/C++ compilers
and will be unavailable if only Intel Fortran has been installed.

Fixes: #17550
 2017-12-12 14:43:08 +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