mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-02 04:02:23 +03:00
Code Activity
47,352 Commits 2 Branches 414 Tags
94de927cab19609aeeff032c64f16cfd257fca2f
Commit Graph
47352 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
Marc Chevrier 417c533010 Merge topic 'findpython_conda_support' 
776d27d4a4 FindPython: Extend virtual environment handling by considering conda

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4155
 2019-12-23 06:33:54 -05:00
Kitware Robot 20e0d3c33d CMake Nightly Date Stamp 2019-12-23 00:01:08 -05:00
Kitware Robot 77b49149f5 CMake Nightly Date Stamp 2019-12-22 00:01:07 -05:00
Saleem Abdulrasool 576c2e7a2d Swift: move windows handling into platform file (NFC) 
This moves the definition of the import library flags for Windows into a
platform specific file (much like the Darwin `-sdk` flag).  This is in
preparation for re-use of the flag to make the flags handling for
executables more precise.
 2019-12-21 18:25:54 -08:00
Sebastian Müller 776d27d4a4 FindPython: Extend virtual environment handling by considering conda 
- Add functionality to recognize and use CONDA_PREFIX environment variable
- Add tests for conda virtual environments
- Fixes: #20111
 2019-12-21 15:38:00 +01:00
Kitware Robot 419fd17aa9 CMake Nightly Date Stamp 2019-12-21 00:01:10 -05:00
Kyle Edwards dbc8b3c599 Merge topic 'test-objc-enable' 
2b6c2e55e7 Tests: Enable missing Objective C/C++ tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4152
 2019-12-20 13:00:19 -05:00
Kyle Edwards 61960fa466 Merge topic 'add_find_call_debugging' 
f3c9396260 Help: Document CMAKE_FIND_DEBUG_MODE
204b8d9f4e find_*: Use debug logging infrastructure
a7ea20649d find_*: Add debug logging infrastructure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3935
 2019-12-20 12:59:50 -05:00
Kyle Edwards 1a81acdd22 Merge topic 'add_custom_command-depends-path' 
f5126badd8 add_custom_command: convert DEPENDS path arguments to absolute paths
a5f44ec925 cmAddCustomCommandCommand: remove unnecessary braces

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4148
 2019-12-20 12:58:31 -05:00
Kyle Edwards 2fafa66b18 Merge topic 'modernize-memory-management' 
dc2daa6860 cmFileMonitor: modernize memory management
23130c539f cmInstalledFile: modernize memory management
3c632b89ab cmOrderDirectories: Modernize memory management

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4149
 2019-12-20 12:57:58 -05:00
Kyle Edwards 51cc3f1bff Merge topic 'FindPython-Fix-target-properties' into release-3.16 
fe280e0cda FindPython*: Fix erroneous target properties setting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4154
 2019-12-20 12:57:07 -05:00
Kyle Edwards 71e957f0ee Merge branch 'release-3.16' 2019-12-20 12:57:07 -05:00
Kyle Edwards 3e07995bdd Merge topic 'FindPython-Fix-target-properties' 
fe280e0cda FindPython*: Fix erroneous target properties setting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4154
 2019-12-20 12:57:07 -05:00
Kitware Robot 826876f62a CMake Nightly Date Stamp 2019-12-20 00:01:14 -05:00
Marc Chevrier fe280e0cda FindPython*: Fix erroneous target properties setting 
Property IMPORTED_CONFIGURATIONS for targets Python*::Python
and Python*::Module is not correctly set.
 2019-12-19 19:42:24 +01:00
Brad King 2b6c2e55e7 Tests: Enable missing Objective C/C++ tests 
Some test cases added by commit 80f120a85f (Languages: Add support for
Objective-C, 2019-09-13, v3.16.0-rc1~44^2~3) have never actually been
run because the condition to enable them is never true.  Fix the
condition and fix the tests to pass.
 2019-12-19 11:38:53 -05: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
Robert Maynard f3c9396260 Help: Document CMAKE_FIND_DEBUG_MODE 2019-12-19 08:09:49 -05:00
Robert Maynard 204b8d9f4e find_*: Use debug logging infrastructure 
Teach the find_package, find_library, find_program, find_path, and
find_file commands to print debug log messages when enabled by the
`--debug-find` command-line option or `CMAKE_FIND_DEBUG_MODE` variable.
 2019-12-19 08:09:49 -05:00
Robert Maynard a7ea20649d find_*: Add debug logging infrastructure 
Enable debug messages a new `--find-debug` command-line option or via
the `CMAKE_FIND_DEBUG_MODE` variable.

This work was started by Chris Wilson, continued by Ray Donnelly, and
then refactored by Robert Maynard to collect information into a single
message per find query.

Co-Author: Ray Donnelly <mingw.android@gmail.com>
Co-Author: Chris Wilson <chris+github@qwirx.com>
 2019-12-19 08:09:49 -05:00
Marc Chevrier dc2daa6860 cmFileMonitor: modernize memory management 2019-12-19 11:15:17 +01:00
Marc Chevrier 23130c539f cmInstalledFile: modernize memory management 2019-12-19 11:15:13 +01:00
Kitware Robot 9f75f9974f CMake Nightly Date Stamp 2019-12-19 00:01:12 -05:00
Ben Boeckel f5126badd8 add_custom_command: convert DEPENDS path arguments to absolute paths 
This is only done if they are "obviously" paths in that they contain a
directory separator.

Fixes: #17111
 2019-12-18 13:57:07 -05:00
Marc Chevrier 3c632b89ab cmOrderDirectories: Modernize memory management 2019-12-18 17:27:16 +01: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
Ben Boeckel a5f44ec925 cmAddCustomCommandCommand: remove unnecessary braces 2019-12-18 09:50:15 -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