mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 22:58:37 -05:00
Code Issues Packages Projects Releases Wiki Activity
46,178 Commits 2 Branches 401 Tags
482497e0debc3de9f125c8c849a40872971a4a7e
Commit Graph

46178 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Mensinger 482497e0de trace: Add JSON output format 
Add a new `--trace-format=` flag, to enable the new JSON trace
output format. This new format is easier to parse by machines
than the existing format. This new format also removes the
ambiguity of the whitespace in the "old" format (e.g. is that
whitespace part of a file path, or does it seperate arguments)
 2019-12-23 14:05:36 +01:00
Brad King 10fea25139 Merge branch 'release-3.16' 2019-12-19 10:56:38 -05:00
Brad King 512ab500f0 CMake 3.16.2 v3.16.2 2019-12-19 09:54:31 -05:00
Brad King e8f83eea4f Merge branch 'release-3.16' 2019-12-19 09:52:34 -05:00
Brad King a3455779fb Merge topic 'autogen-no-hh' 
7fa7f55230 Autogen: Revert processing of .hh files for compatibility

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4146
 2019-12-19 09:52:34 -05:00
Brad King f9ee055d53 Merge topic 'autogen-no-hh' into release-3.16 
7fa7f55230 Autogen: Revert processing of .hh files for compatibility

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4146
 2019-12-19 09:52:33 -05:00
Brad King 50de8d744c Merge branch 'release-3.16' 2019-12-19 09:51:53 -05:00
Brad King 4126784ce4 Merge topic 'test-resource-spec-init-lists' into release-3.16 
e8dbe4bba1 Tests: Fix testCTestResourceSpec struct initialization for some compilers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Dickens <michael.dickens@ettus.com>
Merge-request: !4141
 2019-12-19 09:51:53 -05:00
Brad King 1546ee39bd Merge topic 'test-resource-spec-init-lists' 
e8dbe4bba1 Tests: Fix testCTestResourceSpec struct initialization for some compilers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Dickens <michael.dickens@ettus.com>
Merge-request: !4141
 2019-12-19 09:51:53 -05:00
Kitware Robot 9f75f9974f CMake Nightly Date Stamp 2019-12-19 00:01:12 -05:00
Brad King e6c4d7d4be Merge topic 'copyright-year' 
1edc4a8a7e Copyright.txt: Update year range to end in 2020

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4147
 2019-12-18 10:00:46 -05:00
Brad King 1edc4a8a7e Copyright.txt: Update year range to end in 2020 2019-12-18 09:34:55 -05:00
Brad King 118f7efba9 Merge topic 'FindLAPACK-in-blas' into release-3.16 
930f204b68 FindLAPACK: Fix support for LAPACK symbols inside BLAS libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4144
 2019-12-18 09:33:21 -05:00
Brad King 89f30e9e1f Merge branch 'release-3.16' 2019-12-18 09:33:21 -05:00
Brad King 5b4921d19b Merge topic 'FindLAPACK-in-blas' 
930f204b68 FindLAPACK: Fix support for LAPACK symbols inside BLAS libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4144
 2019-12-18 09:33:21 -05:00
Brad King 62475f7da0 Merge topic 'FindBoost-1.72' into release-3.16 
e51232b739 FindBoost: Add support for Boost 1.72

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4143
 2019-12-18 09:32:41 -05:00
Brad King 6a16b98f39 Merge branch 'release-3.16' 2019-12-18 09:32:41 -05:00
Brad King 5668428400 Merge topic 'FindBoost-1.72' 
e51232b739 FindBoost: Add support for Boost 1.72

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4143
 2019-12-18 09:32:41 -05:00
Brad King 0607a50bb3 Merge topic 'add-header-cmext-algorithm' 
f7d12609f0 Refactoring: use append functions from cmext/algorithm
a38d04c076 Refactoring: introduce header cmext/algorithm with append functions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4131
 2019-12-18 09:32:03 -05:00
Brad King 930f204b68 FindLAPACK: Fix support for LAPACK symbols inside BLAS libraries 
Fix the condition added by commit 68dcbeee01 (FindLAPACK: Test for
implicitly linked LAPACK libraries, 2019-06-11, v3.16.0-rc1~560^2) to
use BLAS libraries if they are sufficient with no dedicated LAPACK
libraries.

Fixes: #20099
 2019-12-18 05:51:50 -05:00
Michael Dickens e8dbe4bba1 Tests: Fix testCTestResourceSpec struct initialization for some compilers 
Some compilers do not like the nested `{{{}}}` member initialization
syntax, so use just `{}`.  GCC 4.8 warns about the latter, so add a
suppression.

Fixes: #20097
 2019-12-18 05:45:08 -05:00
Brad King 7fa7f55230 Autogen: Revert processing of .hh files for compatibility 
Since commit 4a9154537c (Autogen: Use cmake::IsHeader/SourceExtension
for file type detection, 2019-07-02, v3.16.0-rc1~470^2~4) we process
`.hh` files with `AUTOMOC`.  However, this change can break existing
projects that do not expect the behavior.  Revert it for now.  It can
be restored later via a policy.

Fixes: #20101
 2019-12-18 05:34:27 -05:00
Kitware Robot c507661ca0 CMake Nightly Date Stamp 2019-12-18 00:01:11 -05:00
Brad King 3289322e4f Merge topic 'FindCUDAToolkit-module' 
d484a3c4d8 FindCUDAToolkit: correct searches for Toolkit components
e2a5d8374f FindCUDAToolkit: Improve usage, library set, and tests
29560bf07b FindCUDAToolkit: Import targets for toolkit libraries
2c0ff263b4 FindCUDAToolkit: Add module to find the CUDA Toolkit
12d324e55d CUDA: Persist SIZEOF_VOID_P and PLATFORM_ABI

Acked-by: Kitware Robot <kwrobot@kitware.com>
Rejected-by: Brad King <brad.king@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !4093
 2019-12-17 11:13:50 -05:00
Brad King 1369db7406 Merge topic 'better_category_for_target_debug_property' 
b23c778034 CMAKE_DEBUG_TARGET_PROPERTIES to `provides information` section

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4142
 2019-12-17 11:13:02 -05:00
Brad King 37a30f228a Merge topic 'fix-vs-winrt-by-default' 
557ea4614e VS: Change CMAKE_VS_WINRT_BY_DEFAULT to not implicitly enable WinRT
7bcef355bf Vs: Add test for VS_WINRT_BY_DEFAULT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4127
 2019-12-17 11:11:24 -05:00
Brad King 2d17101269 Merge topic 'vs-xml-improve' 
d8f1736dcc cmVisualStudio10TargetGenerator: improve XML element generation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4140
 2019-12-17 11:10:21 -05:00
Brad King 64e2891cbd Merge topic 'stdstring-target' 
c34b4497f8 cmTarget: add std::string overloads

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4137
 2019-12-17 11:09:20 -05:00
Brad King 7d69ab02ad Merge topic 'FindProtobuf-no-protoc' 
db0b740fd8 FindProtobuf: Do not verify protoc version if it is not found

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4121
 2019-12-17 11:08:12 -05:00
Brad King 671ed5b123 Merge topic 'fat-ios' 
a9b41195d2 Handle multi-arch sysroots on Apple platforms
372c89ea38 Refactor -arch and -isysroot code usage
7a44e16d7f Refactor SDK name to path into a function
777d364913 Use xcrun instead of xcodebuild for resolving SDK path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4125
 2019-12-17 11:07:09 -05:00
Brad King e51232b739 FindBoost: Add support for Boost 1.72 
Run `Utilities/Scripts/BoostScanDeps.cmake` with the Boost 1.72.0
sources to compute dependencies.

Fixes: #20100
 2019-12-17 10:37:06 -05:00
Marc Chevrier f7d12609f0 Refactoring: use append functions from cmext/algorithm 2019-12-17 10:44:02 +01:00
Marc Chevrier a38d04c076 Refactoring: introduce header cmext/algorithm with append functions 2019-12-17 10:43:58 +01:00
Kitware Robot d082d0e109 CMake Nightly Date Stamp 2019-12-17 00:01:16 -05:00
Robert Maynard b23c778034 CMAKE_DEBUG_TARGET_PROPERTIES to provides information section 
This variable only provides debug information and doesn't modify
the output of CMake, so move it to the correct variable
section.
 2019-12-16 17:05:12 -05:00
Robert Maynard d484a3c4d8 FindCUDAToolkit: correct searches for Toolkit components 2019-12-16 14:35:03 -05:00
Petr Polezhaev 557ea4614e VS: Change CMAKE_VS_WINRT_BY_DEFAULT to not implicitly enable WinRT 
Original behaviour would unconditionally enable WinRT for all projects
so source file flag generation code can acknowledge WinRT being present
and disable it for C language source files.  An unintentional result of
that approach is that WinRT is enabled for ALL projects, including C++
projects/source files with no way to disable it

Instead use `CMAKE_VS_WINRT_BY_DEFAULT` as a hint that the platform is
WinRT-by-default and set global `CompileAsWinRT` flag to `false` unless
it was explicitly requested by either `WINRT_COMPONENT` option or `/ZW`
compilation option - similar to what Windows Phone/Windows Store
platform logic does

In case WinRT compilation is enabled for a project by either of
aforementioned methods, C language source file override logic will still
kick in and disable CompileAsWinRT for C source files

Fixes: #20063
 2019-12-16 13:46:59 -05:00
Diego Pino Garcia db0b740fd8 FindProtobuf: Do not verify protoc version if it is not found 2019-12-16 11:43:47 -05:00
Brad King 5ba141e5ff Merge branch 'release-3.15' 2019-12-16 11:23:56 -05:00
Robert Maynard e2a5d8374f FindCUDAToolkit: Improve usage, library set, and tests 
Refined the initial design of FindCUDAToolkit and improve it
by adding more library support, more toolkit information and
tests.
 2019-12-16 11:15:12 -05:00
Stephen McDowell 29560bf07b FindCUDAToolkit: Import targets for toolkit libraries 2019-12-16 10:31:43 -05:00
Stephen McDowell 2c0ff263b4 FindCUDAToolkit: Add module to find the CUDA Toolkit 2019-12-16 10:31:43 -05:00
Robert Maynard 12d324e55d CUDA: Persist SIZEOF_VOID_P and PLATFORM_ABI 
The CUDA language failed to persist CMAKE_SIZEOF_VOID_P
and CMAKE_INTERNAL_PLATFORM_ABI, causing find_ calls to fail when
the only enabled language was CUDA. This specifically occurred
when having to locate libraries inside `lib64` directories.
 2019-12-16 10:31:43 -05:00
Brad King 5b43aa7755 CMake 3.15.6 v3.15.6 2019-12-16 10:21:27 -05:00
Brad King 19f04031b6 Merge topic 'ninja-multi' 
8c062f9d99 Help: Add documentation and release notes for multi-config Ninja
e0478cc646 Tests: Add test for Multi-Configuration Ninja generator
5a8a9f7229 Ninja: Add multi-config variant
3bc63e99e4 Refactor: Prepare Ninja generator for multi-config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4086
 2019-12-16 10:06:48 -05:00
Brad King a1dc0a3a22 Merge topic 'bootstrap-intel' 
033a4b12a5 bootstrap: Extend C++17 check for our cast functions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4139
 2019-12-16 10:05:53 -05:00
Brad King 43e6254a17 Merge topic 'test-vtk' 
59e2e72159 Tests/Contracts: Update VTK repository URL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4138
 2019-12-16 10:05:18 -05:00
Brad King dfbe8109b4 Merge topic 'pch-force-include' into release-3.16 
c5c218fa0d PCH: Append pch header file to list of forced include files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4135
 2019-12-16 10:04:03 -05:00
Brad King 50ee80dff7 Merge branch 'release-3.16' 2019-12-16 10:04:03 -05:00
Brad King fe7626da54 Merge topic 'pch-force-include' 
c5c218fa0d PCH: Append pch header file to list of forced include files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4135
 2019-12-16 10:04:03 -05:00