mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-06 14:19:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
46,293 Commits 2 Branches 401 Tags
2ee6baef4fdb2ace515b3c6032f3a1c35173aedc
Commit Graph

46293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 2ee6baef4f Merge topic 'ninja-postgen-commands' 
fb18215904 Ninja: clean ninja metadata once generated

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jan Niklas Hasse <jhasse@bixense.com>
Merge-request: !3316
 2020-01-10 13:30:35 -05:00
Brad King d76e4c147a Merge branch 'release-3.15' 2020-01-10 13:23:07 -05:00
Brad King 67e64092e1 Merge branch 'release-3.16' 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 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 a004779f95 Merge branch 'release-3.16' 2020-01-10 13:20:03 -05:00
Brad King a7fc5df5d3 Merge topic 'GNUtoMS-vs2019' into release-3.16 
08c5b3eff0 GNUtoMS: Add search path for VS 2019 environment scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4197
 2020-01-10 13:20:03 -05:00
Brad King ba3552dce5 Merge topic 'GNUtoMS-vs2019' 
08c5b3eff0 GNUtoMS: Add search path for VS 2019 environment scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4197
 2020-01-10 13:20:03 -05:00
Brad King a56b862941 Merge branch 'release-3.16' 2020-01-10 13:18:36 -05:00
Brad King 213b03d275 Merge topic 'objc-compiler-launcher' into release-3.16 
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 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 fc94de6897 Merge topic 'custom-target-FOLDER' 
353405daef Add support for FOLDER target property to custom targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4193
 2020-01-10 13:17:28 -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 9f2719b31e Merge topic 'findopenssl-dependencies-link-order' 
90973c4abd FindOpenSSL: Fix ordering of dependency link flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4173
 2020-01-10 13:10:42 -05:00
Craig Scott 3795dea6f1 Merge topic 'docs-autogen' 
159d2ead95 Help: Mention both target and source properties for AUTO..._OPTIONS
648234b8ba Help: Clarify/add docs for initializing AUTO..._OPTIONS properties
dd2f42cc84 Help: Clean up formatting and typos in autogen docs
2ec57e11fb Help: Fix sorting of property indexes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4194
 2020-01-10 07:02:38 -05:00
Marc Chevrier c1b5f8eb45 Merge topic 'FindPython-SOABI' 
61502d3956 FindPython: Add variable Python_SOABI

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4190
 2020-01-10 04:55:20 -05:00
Kitware Robot ee20c0ebf4 CMake Nightly Date Stamp 2020-01-10 00:01:16 -05:00
Brad King 08c5b3eff0 GNUtoMS: Add search path for VS 2019 environment scripts 
Extend the logic from commit abe8a623d9 (GNUtoMS: Add search path for VS
2017 environment scripts, 2017-05-19, v3.8.2~1^2) to consider VS 2019
paths too.

Fixes: #20162
 2020-01-09 16:56:30 -05:00
Brad King f6ef6e5a73 Merge branch 'backport-3.16-objc-compiler-launcher' 2020-01-09 13:53:23 -05:00
Cristian Adam 1a9f6bad98 ObjC: Add _COMPILE_LAUNCHER support 
Fixes: #20178
 2020-01-09 13:52:37 -05:00
Luca Cappa 353405daef Add support for FOLDER target property to custom targets 
Fixes: #18372
 2020-01-09 11:55:12 -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 c89a696721 Merge branch 'backport-3.15-cuda-device-link-only-cuda' into release-3.15 
Merge-request: !4191
 2020-01-09 11:19:30 -05:00
Brad King 7ffa42288e Merge branch 'backport-3.15-cuda-device-link-only-cuda' 2020-01-09 11:13:51 -05:00
Brad King d4d11b1707 Merge branch 'release-3.16' 2020-01-09 11:11:16 -05:00
Brad King 68537b890b Merge branch 'release-3.15' into release-3.16 2020-01-09 11:10:32 -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
Marc Chevrier 635225513e Merge topic 'fix-check-compiler-flag-gcc-9' 
8b10e493ac check_LANG_compiler_flag: add the "deprecated switch" message for GCC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4165
 2020-01-09 05:29:21 -05:00
Marc Chevrier d168fa2024 Merge topic 'findlibxml2_consistent_info' 
4041cf5f61 FindLibXml2: ensure consistent paths, version and flag information

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4188
 2020-01-09 05:14:26 -05:00
Craig Scott 159d2ead95 Help: Mention both target and source properties for AUTO..._OPTIONS 2020-01-09 20:34:39 +11:00
Craig Scott 648234b8ba Help: Clarify/add docs for initializing AUTO..._OPTIONS properties 2020-01-09 20:33:56 +11:00
Craig Scott dd2f42cc84 Help: Clean up formatting and typos in autogen docs 2020-01-09 20:32:27 +11:00
Craig Scott 2ec57e11fb Help: Fix sorting of property indexes 2020-01-09 20:30:49 +11:00
Kitware Robot 428b38bb21 CMake Nightly Date Stamp 2020-01-09 00:01:15 -05:00
Marc Chevrier d020ed99e9 Merge topic 'modernize-memory-management' 
a00960288b GlobalGenerator family: modernize memory management

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4181
 2020-01-08 11:32:59 -05:00
Kitware Robot 75dfba223f CMake Nightly Date Stamp 2020-01-08 00:01:08 -05:00
Sylvain Joubert 4041cf5f61 FindLibXml2: ensure consistent paths, version and flag information 
As pkg-config is used as hint to perform the actual lookup of libraries
and include paths we may not find the pkg-config installation.
Mainly this makes sure the pkg-config information are used only if the
actual installation reported to the user is the one from pkg-config.

Fixes: #20149
 2020-01-07 15:50:10 +01:00
Marc Chevrier a00960288b GlobalGenerator family: modernize memory management 2020-01-07 11:03:11 +01:00
Kitware Robot e353d8bd9b CMake Nightly Date Stamp 2020-01-07 00:01:12 -05:00
Marc Chevrier 9abe670cd7 Merge topic 'clang-format-headers-sort' 
a8aa89352a clang-format: fix erroneous handling of header <queue>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4182
 2020-01-06 12:44:49 -05:00
Ben Boeckel fb18215904 Ninja: clean ninja metadata once generated 
Fixes: #15830
 2020-01-06 11:57:08 -05:00
Kyle Edwards e1f632cea0 Merge topic 'autogen_hh_headers' 
9eab3cad6a Tests: Add AUTOGEN policy CMP0100 test
8c2be3ae94 Tests: Restore Autogen/SameName .hh header test
abad139c99 Autogen: Process .hh headers based on new policy CMP0100 settings
4db1463e05 Autogen: Try adding header suffix to moc output file name on name conflicts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4170
 2020-01-06 11:39:29 -05:00
Marc Chevrier a8aa89352a clang-format: fix erroneous handling of header <queue> 
The rule Regex: '^<' was not applied to this header because a more specific one applies: Regex: '^(<|")Qt?[A-Z]' used for Qt headers (rules are not case-sensitive). So adding a specific rule for this header before the Qt rule is required.
 2020-01-06 17:33:45 +01:00
Kitware Robot b67c53dddf CMake Nightly Date Stamp 2020-01-06 00:01:08 -05:00
Kitware Robot 3f8be0ad66 CMake Nightly Date Stamp 2020-01-05 00:01:07 -05: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
Sebastian Holtermann abad139c99 Autogen: Process .hh headers based on new policy CMP0100 settings 
Reintroduces .hh header processing in AUTOMOC and AUTOUIC based on the new
policy CMP0100 setting.

Fixes: #13904 CMAKE_AUTOMOC misses headers with ".hh" extension
 2020-01-04 11:33:04 +01:00