Commit Graph

28255 Commits

Author SHA1 Message Date
Brad King b1a9d49a69 Merge topic 'objc-visibility-inlines' into release-3.16
7347e2f830 ObjC: Add VISIBLITY_INLINES_HIDDEN support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4199
2020-01-13 10:22:06 -05:00
Brad King 24d143e0f6 Merge topic 'objc-visibility-inlines'
7347e2f830 ObjC: Add VISIBLITY_INLINES_HIDDEN support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4199
2020-01-13 10:22:06 -05:00
Kitware Robot e4c0711602 CMake Nightly Date Stamp 2020-01-13 00:01:10 -05:00
Kitware Robot 26e9e091c1 CMake Nightly Date Stamp 2020-01-12 00:01:08 -05:00
Kitware Robot ea851fbe44 CMake Nightly Date Stamp 2020-01-11 00:01:18 -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 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 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 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 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
Cristian Adam 7347e2f830 ObjC: Add VISIBLITY_INLINES_HIDDEN support
Fixes: #20193
2020-01-10 16:31:27 +01:00
Kitware Robot ee20c0ebf4 CMake Nightly Date Stamp 2020-01-10 00:01:16 -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 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 968477517e Refactoring: suppress cmEraseIf in favor of cm::erase_if 2020-01-09 11:19:20 +01: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
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
Vitaly Stakhovsky 93e9d10c7f cmCacheManager: more members use std::string 2020-01-06 00:26:28 -05: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 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
Sebastian Holtermann 4db1463e05 Autogen: Try adding header suffix to moc output file name on name conflicts
In AUTOGEN, this changes the moc output file name computation on output name
conflicts to first try to add the header suffix to the moc output base name.
When that still conflicts, we try adding a range of sequential numbers.
If we still can't find an unique output name, we raise an error.
2020-01-04 11:32:14 +01:00
Kitware Robot 85287ff10d CMake Nightly Date Stamp 2020-01-04 00:01:15 -05: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
Marc Chevrier e7f3db6463 Merge topic 'cmstate-std-string'
232d5bc333 cmState: more members will use std::string

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4164
2020-01-03 04:51:25 -05:00
Kitware Robot 19c2763a21 CMake Nightly Date Stamp 2020-01-03 00:01:15 -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
Vitaly Stakhovsky 232d5bc333 cmState: more members will use std::string 2020-01-02 07:56:34 -05:00
Marc Chevrier 47a907413b Merge topic 'modernize-memory-management'
5444a8095d cmGlobalGenerator: modernize memrory managemenbt

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4166
2020-01-02 05:23:32 -05:00
Kitware Robot 9c3a0c3e1d CMake Nightly Date Stamp 2020-01-02 00:01:09 -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