mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-04 05:10:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
46,366 Commits 2 Branches 401 Tags
2e882b4275eea16eff0debc10fe6431bc50acd9e
Commit Graph

7047 Commits

Author SHA1 Message Date
Kyle Edwards 93526fd913 Merge topic 'ninja_multi_config_support_cuda' 
c7ac13e8ed CUDA: Mult-Config Ninja generator now supports CUDA

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4187
 2020-01-14 15:11:35 -05:00
Brad King 710371ca2f Merge topic 'tutorial' 
a7d25358a0 Tutorial: Add the PRIVATE keyword to target_link_libraries command
cf2afb1065 Tutorial: Remove 'Consumer' example
77b515f3eb Tutorial: Improve "MultiPackage" example
3a510a47b0 Tutorial: Add links to relevant CMake documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4113
 2020-01-14 09:06:40 -05:00
Robert Maynard c7ac13e8ed CUDA: Mult-Config Ninja generator now supports CUDA 2020-01-13 12:50:37 -05:00
Kyle Edwards ca9100c5ce Ninja Multi-Config: Improve error handling when not doing cross-config build 2020-01-13 11:58:07 -05:00
Brad King 4bac5b628e Merge topic 'target_compile_options-BEFORE-keyword' 
2678e31053 target_compile_options: ensure BEFORE keyword is handled in all scopes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4203
 2020-01-13 10:38:00 -05:00
Brad King 041e58d195 Merge topic 'ninja-cross-build-disable' 
e8032e202e Ninja Multi-Config: Make cross-config building opt-in

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4205
 2020-01-13 10:34:18 -05:00
Brad King 9a5d399725 Merge topic 'out-of-dir-link-keyword' 
09721ca078 target_link_libraries: Fix out-of-dir calls with debug/optimized keywords
c40229968c target_link_libraries: Add FIXME comment for out-of-dir genex list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4202
 2020-01-13 10:29:10 -05:00
Brad King e61c2ed9ac Merge topic 'fix-cpack-deb-description-file' 
d491f34a5e CPack: Fix regression in DEB generator description

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4204
 2020-01-13 10:23:26 -05:00
Marc Chevrier 2678e31053 target_compile_options: ensure BEFORE keyword is handled in all scopes 
Fixes: #20200
 2020-01-11 01:25:25 +01:00
Kyle Edwards d491f34a5e CPack: Fix regression in DEB generator description 
Fixes: #20102
 2020-01-10 17:22:52 -05:00
Kyle Edwards e8032e202e Ninja Multi-Config: Make cross-config building opt-in 
Many users will want to use the Ninja Multi-Config generator like a
traditional Visual Studio-style multi-config generator, which doesn't
mix configurations - custom commands are built using target executables
of the same configuration the command is for. We do not want to force
these people to generate an N*N build matrix when they only need N*1,
especially if they have lots of targets. Add a new variable,
CMAKE_NINJA_CROSS_CONFIG_ENABLE, to opt-in to the cross-config build
matrix.
 2020-01-10 16:31:29 -05:00
Kyle Edwards 78f9c9dd0e Merge topic 'nsis-headerimage' 
ebfffc609e CPack/NSIS: Add option for setting MUI_HEADERIMAGE_BITMAP

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4157
 2020-01-10 13:48:47 -05:00
Brad King 9fa8b7d5dd Merge topic 'cuda-device-link-only-cuda' into release-3.16 
7ffa42288e Merge branch 'backport-3.15-cuda-device-link-only-cuda'
071c4f1a2a CUDA: Do not device link if target has no CUDA usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4191
 2020-01-10 13:21:12 -05:00
Brad King 4a010ee52b Merge topic 'cuda-device-link-only-cuda' 
01c90d76a1 Merge branch 'backport-3.16-cuda-device-link-only-cuda'
7ffa42288e Merge branch 'backport-3.15-cuda-device-link-only-cuda'
071c4f1a2a CUDA: Do not device link if target has no CUDA usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4191
 2020-01-10 13:21:12 -05:00
Brad King eb672da7d4 Merge topic 'objc-compiler-launcher' 
f6ef6e5a73 Merge branch 'backport-3.16-objc-compiler-launcher'
1a9f6bad98 ObjC: Add _COMPILE_LAUNCHER support
a05b9d4239 ObjC: Add _COMPILE_LAUNCHER support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4189
 2020-01-10 13:18:35 -05:00
Brad King 18e97c00f4 Merge topic 'reduce_verbosity_find_package_debug_mode' 
6c92df382f find_package: Improve debug logging output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4175
 2020-01-10 13:16:30 -05:00
Brad King 09721ca078 target_link_libraries: Fix out-of-dir calls with debug/optimized keywords 
In commit a1ad0a699b (target_link_libraries: Allow use with targets in
other directories, 2018-09-07, v3.13.0-rc1~94^2) we added use of `<...>`
to encode a directory id, but the closing `>` can incorrectly terminate
a surrounding generator expression early.  Encode the directory id using
`(...)` instead.

Fixes: #20202
 2020-01-10 11:40:34 -05:00
Brad King c40229968c target_link_libraries: Add FIXME comment for out-of-dir genex list 
Issue: #20204
 2020-01-10 11:40:18 -05:00
Betsy McPhail 77b515f3eb Tutorial: Improve "MultiPackage" example 
Rename to Step 12 and ensure that it follows Step 11
 2020-01-10 11:37:54 -05:00
Cristian Adam 1a9f6bad98 ObjC: Add _COMPILE_LAUNCHER support 
Fixes: #20178
 2020-01-09 13:52:37 -05:00
Cristian Adam a05b9d4239 ObjC: Add _COMPILE_LAUNCHER support 
Fixes: #20178
 2020-01-09 11:35:23 -05:00
Brad King 01c90d76a1 Merge branch 'backport-3.16-cuda-device-link-only-cuda' 2020-01-09 11:21:09 -05:00
Brad King 7ffa42288e Merge branch 'backport-3.15-cuda-device-link-only-cuda' 2020-01-09 11:13:51 -05:00
Robert Maynard 071c4f1a2a CUDA: Do not device link if target has no CUDA usage 
When CUDA is enabled, and a pure non-CUDA target has
CMAKE_CUDA_SEPARABLE_COMPILATION enabled, don't actually perform
the device linking step, as it will fail. A target that has
CMAKE_CUDA_SEPARABLE_COMPILATION enabled must also have CUDA
usage (either itself, or something it links to).

Fixes: #20182
 2020-01-09 11:02:17 -05:00
Marc Chevrier 61502d3956 FindPython: Add variable Python_SOABI 
This variable holds the standard extension suffix for modules.

Fixes: #20150
 2020-01-09 14:43:22 +01:00
Sebastian Holtermann 9eab3cad6a Tests: Add AUTOGEN policy CMP0100 test 
Add a test for policy CMP0100 that configures whether or not
AUTOMOC and AUTOUIC should process .hh header files.
 2020-01-04 11:33:05 +01:00
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