mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 22:30:13 -06:00
Code Issues Packages Projects Releases Wiki Activity
47,352 Commits 2 Branches 385 Tags
94de927cab19609aeeff032c64f16cfd257fca2f
Commit Graph

7271 Commits

Author SHA1 Message Date
Sebastian Holtermann
8c2be3ae94 Tests: Restore Autogen/SameName .hh header test 
In commit 7fa7f55230, the Autogen/SameName test
was changed to not test .hh header file processing in AUTOGEN anymore,
because we had to revert that feature.  Since we now support .hh header file
processing in AUTOMOC again, we can restore the Autogen/SameName test for
that.
 2020-01-04 11:33:04 +01:00
Kyle Edwards
e7675acacb Merge topic 'add_target_deprecation' 
c621839bd9 Add set_property option: DEPRECATION

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Daniele E. Domenichelli <ddomenichelli@drdanz.it>
Merge-request: !4128
 2020-01-03 11:30:48 -05:00
Kyle Edwards
3c548cfaf6 Merge topic 'trace-test-support-python26-and-older' 
00f25dacc0 trace: Directly parse commandline arguments without argparse

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4169
 2020-01-03 11:28:29 -05:00
Kyle Edwards
2c95cb3c2e Merge topic 'msvc_support_nvcc--compiler-options' 
568298a336 CUDA: MSVC + NVCC support --compiler-options compiler flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4177
 2020-01-03 11:27:52 -05:00
Joseph Snyder
c621839bd9 Add set_property option: DEPRECATION 
Add a new property flag for a target which contains a message regarding
deprecation status.

Add a warning at "Generate" time if a linked target is marked as
deprecated.

Expand ExportImport test to ensure that new property is being set and
passed correctly.  Ensure that the message is shown during the
"Generate" step run of the ExportImport test.
 2020-01-02 17:11:31 -05:00
Johnny Jazeix
ebfffc609e CPack/NSIS: Add option for setting MUI_HEADERIMAGE_BITMAP 
Fixes: #20120
 2020-01-02 22:27:31 +01:00
Robert Maynard
568298a336 CUDA: MSVC + NVCC support --compiler-options compiler flag 
Fixes #20164
 2020-01-02 14:35:24 -05:00
Kyle Edwards
98272cd155 Merge topic 'double-i' 
397d162b9a Tests: do not use the same variable name in nested loops

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4172
 2020-01-02 10:03:37 -05:00
Robert Maynard
6c92df382f find_package: Improve debug logging output 
The find_package debug log messages are now easier to read when enabled by the
`--debug-find` command-line option or `CMAKE_FIND_DEBUG_MODE` variable.
 2020-01-01 15:00:42 -05:00
Daniel Mensinger
00f25dacc0 trace: Directly parse commandline arguments without argparse 2020-01-01 11:18:26 +01:00
Rolf Eike Beer
397d162b9a Tests: do not use the same variable name in nested loops 
Spotted by LGTM.com.
 2019-12-31 13:30:18 +01:00
Sylvain Joubert
a179cbf205 FindLibXml2: provide imported target LibXml2::xmllint 2019-12-31 12:45:26 +01:00
Craig Scott
da9cbeb3e9 Merge topic 'ctest-resource-allocation-spec-message' 
b393b32b4b CTest: Improve error handling when reading resource spec file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4162
 2019-12-28 19:03:00 -05:00
Kyle Edwards
b393b32b4b CTest: Improve error handling when reading resource spec file 
Fixes: #20079
 2019-12-27 10:53:52 -05:00
Kyle Edwards
bb811568cc Merge topic 'traceJSON' 
e113ab1168 trace: Add test for the JSON-v1 trace
482497e0de trace: Add JSON output format

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4102
 2019-12-27 10:53:13 -05:00
Kyle Edwards
e8776d6e3a Merge topic 'cmcoretrycompile_cleanup_symlinks' 
a024d614ca cmCoreTryCompile::CleanupFiles now removes symlinks instead of their contents.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4158
 2019-12-27 10:52:36 -05:00
Johnny Jazeix
a024d614ca cmCoreTryCompile::CleanupFiles now removes symlinks instead of their contents. 
Fixes: #17522
 2019-12-26 17:39:36 +01:00
Daniel Mensinger
e113ab1168 trace: Add test for the JSON-v1 trace 2019-12-23 14:05:42 +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
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
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
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
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
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
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
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
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
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
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
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
Marc Chevrier
a38d04c076 Refactoring: introduce header cmext/algorithm with append functions 2019-12-17 10:43:58 +01: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
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
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
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
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
Petr Polezhaev
7bcef355bf Vs: Add test for VS_WINRT_BY_DEFAULT 2019-12-16 15:00:44 +03:00
Brad King
59e2e72159 Tests/Contracts: Update VTK repository URL 
The vtk.org/vtk.git repository has long been superseded by the
repository on gitlab.kitware.com.  The former is no longer available.
 2019-12-14 12:55:26 -05:00
Kyle Edwards
e0478cc646 Tests: Add test for Multi-Configuration Ninja generator 2019-12-13 10:52:07 -05:00
Kyle Edwards
5a8a9f7229 Ninja: Add multi-config variant 
Co-Authored-by: vector-of-bool <vectorofbool@gmail.com>
 2019-12-13 10:51:46 -05:00
Cristian Adam
c5c218fa0d PCH: Append pch header file to list of forced include files 
Fixes: #20088
 2019-12-13 15:21:27 +01:00
Kyle Edwards
966a9eece3 Merge topic 'function-var-current' 
24fdd51f45 Refactor: Replace CMAKE_CURRENT_LIST_DIR with CMAKE_CURRENT_FUNCTION_LIST_DIR
90e3e2a777 cmFunctionCommand: Introduce `CMAKE_CURRENT_FUNCTION*` variables
dd54290dab Refactor: Modernize `function` command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4000
 2019-12-12 14:00:41 -05:00
Brad King
f6e29e0405 Merge topic 'link-options-propagation' 
af9d4f24ae Link properties: must be transitive over private dependency on static library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4130
 2019-12-12 12:05:57 -05:00