Commit Graph

32222 Commits

Author SHA1 Message Date
Brad King
16e47d64cf Merge topic 'CPackIFW-extra-dot'
331c5d458e CPackIFW: Fix regression in icon file names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Erlend E. Aasland <erlend.aasland@innova.no>
Merge-request: !7174
2022-04-15 08:24:49 -04:00
Brad King
1cf59d5267 Merge topic 'file-set-generated-dependency'
d0d09aa29f FILE_SET: Make INTERFACE libraries with HEADER_SETS participate in buildsystem

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Acked-by: Gabriel Nützi <gnuetzi@gmail.com>
Merge-request: !7173
2022-04-15 08:23:57 -04:00
Kitware Robot
bde8fa4922 CMake Nightly Date Stamp 2022-04-15 00:01:16 -04:00
Jean-Philippe Lebel
331c5d458e CPackIFW: Fix regression in icon file names
Changes in commit 761b6e2466 (CPackIFW: Avoid colliding names for icons
/ logos, 2021-10-08, v3.23.0-rc1~546^2) accidentally left an extra `.`
in computed file names.  Remove it.

Fixes: #23423
2022-04-14 09:45:35 -04:00
Brad King
dd193fa3d3 Merge topic 'export-missing-targets'
8c65b7042e cmExportFileGenerator: Simplify collection of targets missing from export set

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7165
2022-04-14 09:34:59 -04:00
Brad King
3eb9f69ffe Merge topic 'vswhere-support'
f85913fa08 VS: Add support for enumerating VS instances with vswhere
069cff63f6 VS: refactor EnumerateAndChooseVSInstance

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7159
2022-04-14 09:33:49 -04:00
Brad King
f011557f0e Merge topic 'xcode-universal'
40dd46a96a Xcode: Add tests for OBJECT library per target `OSX_ARCHITECTURES`
da4ccb502b Xcode: Check for multiple `OSX_ARCHITECTURES` on target
41ba35a42b cmTarget: Add `HasKnownObjectFileLocation()` shorthand

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7154
2022-04-14 09:30:29 -04:00
Brad King
d96e139f76 Merge topic 'list_presets'
7a8ca8f842 cmCMakePresetsGraph: do not set default value for TestOutputTruncation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Tested-by: Robert Maynard <robertjmaynard@gmail.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !7170
2022-04-14 09:28:12 -04:00
Brad King
0cfd557883 Merge topic 'cmake_host_system_information-query-windows-registry'
17ff86547e cmake_host_system_information: query windows registry

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7155
2022-04-14 09:26:20 -04:00
Kyle Edwards
d0d09aa29f FILE_SET: Make INTERFACE libraries with HEADER_SETS participate in buildsystem
If an INTERFACE library has HEADER_SETS, and its header sets contain
files generated by a custom command, the library needs to participate in
the buildsystem so that the files will be generated.

Fixes: #23422
2022-04-14 09:17:54 -04:00
Kitware Robot
efcf3a46f7 CMake Nightly Date Stamp 2022-04-14 00:01:08 -04:00
Marc Chevrier
17ff86547e cmake_host_system_information: query windows registry
Fixes: #21240, #23367
2022-04-13 08:59:08 -04:00
Niyas Sait
f85913fa08 VS: Add support for enumerating VS instances with vswhere 2022-04-13 08:40:46 -04:00
Kitware Robot
56dafdf199 CMake Nightly Date Stamp 2022-04-13 00:01:28 -04:00
Brad King
efe08e2894 CMake 3.23.1 2022-04-12 10:06:39 -04:00
Brad King
f6476ba3a6 Merge topic 'file-set-repr-improvements'
5fa15ec9f3 Help: Document that target_sources defines [INTERFACE_]HEADER_SETS
c5d4812f20 cmTarget: make HEADER_SETS and INTERFACE_HEADER_SETS read-only
05783b168d cmFileSet: store visibility with the fileset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7168
2022-04-12 10:05:26 -04:00
Brad King
56a11b2f64 Merge topic 'file-set-repr-improvements' into release-3.23
5fa15ec9f3 Help: Document that target_sources defines [INTERFACE_]HEADER_SETS
c5d4812f20 cmTarget: make HEADER_SETS and INTERFACE_HEADER_SETS read-only
05783b168d cmFileSet: store visibility with the fileset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7168
2022-04-12 10:05:25 -04:00
Brad King
8e4af2cb30 Merge topic 'correct_list-presets_parsing'
45299a8f9b cmake: --list=presets=[type] doesn't generate incorrect warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7164
2022-04-12 08:16:01 -04:00
Brad King
4135d726d4 Merge topic 'correct_list-presets_parsing' into release-3.23
45299a8f9b cmake: --list=presets=[type] doesn't generate incorrect warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7164
2022-04-12 08:16:00 -04:00
Brad King
1e1b31ac25 Merge topic 'xcode-pch'
476c6a8910 PCH: Fix Xcode non-pch language exclusion
fcf1fcfd0c Tests: Ignore all classes in Xcode internal objc warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7166
2022-04-12 08:10:48 -04:00
Brad King
4471f2b0d7 Merge topic 'xcode-pch' into release-3.23
476c6a8910 PCH: Fix Xcode non-pch language exclusion
fcf1fcfd0c Tests: Ignore all classes in Xcode internal objc warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7166
2022-04-12 08:10:47 -04:00
Frank Winklmeier
7a8ca8f842 cmCMakePresetsGraph: do not set default value for TestOutputTruncation
The `TestOutputTruncation` is an optional preset. Do not set a default
value to avoid failing the JSON schema version check.

Closes issue #23411.
2022-04-12 13:41:07 +02:00
Kitware Robot
6cd0eefb85 CMake Nightly Date Stamp 2022-04-12 00:01:20 -04:00
Hyper Nova Sun
da4ccb502b Xcode: Check for multiple OSX_ARCHITECTURES on target
When determining a given target's object directory, also check for its
`OSX_ARCHITECTURES` before resorting to global defaults. This fixes inconsistent
object library references when:
- `CMAKE_OSX_ARCHITECTURES` is unset or singular
- but the object library's `OSX_ARCHITECTURES` property is set to multiple archs
2022-04-11 15:02:41 -07:00
Hyper Nova Sun
41ba35a42b cmTarget: Add HasKnownObjectFileLocation() shorthand
Allow `cmGlobalGenerator`s to decide `HasKnownObjectFileLocation()` per given
`cmTarget`

- `cmGlobalGenerator::HasKnownObjectFileLocation()` now takes an optional `cmGeneratorTarget`
- `cmTarget::HasKnownObjectFileLocation()` added as a shorthand
2022-04-11 14:10:29 -07:00
Cristian Adam
476c6a8910 PCH: Fix Xcode non-pch language exclusion
Fix a regression caused by commit bbcdac4e5d (PCH: Fix all-language
precompile header support in Xcode, 2021-08-07, v3.22.0-rc1~140^2).

Fixes: #23138
2022-04-11 14:16:33 -04:00
Ben Boeckel
c5d4812f20 cmTarget: make HEADER_SETS and INTERFACE_HEADER_SETS read-only
There is no reason to allow these properties to be manipulated by user
code. Instead, use the stored visibility on the fileset objects to
derive what these properties should contain.
2022-04-11 14:06:15 -04:00
Ben Boeckel
05783b168d cmFileSet: store visibility with the fileset
The visibility is intrinsic to the fileset, so store it with it. This
avoids recalculating it on every addition to the fileset.
2022-04-11 13:41:40 -04:00
Brad King
8c65b7042e cmExportFileGenerator: Simplify collection of targets missing from export set
Store the list of missing target names in a member instead of threading
an explicit reference to it through the call stack.
2022-04-11 13:40:13 -04:00
Niyas Sait
069cff63f6 VS: refactor EnumerateAndChooseVSInstance
Move all VS instance enumeration code using COM interface to
EnumerateVSInstancesWithCOM
2022-04-11 16:33:03 +01:00
Robert Maynard
45299a8f9b cmake: --list=presets=[type] doesn't generate incorrect warnings
Fixes #23407
2022-04-11 10:46:03 -04:00
Brad King
7fc248bde3 Merge topic 'ccmake-vim-key-navigation'
0354865061 ccmake: Allow Vim keys in cmCursesLongMessageForm

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !7152
2022-04-11 08:52:29 -04:00
Brad King
c362d02e74 Merge topic 'check-flag-fembed-bitcode-conflict'
a10fc754a6 CheckSourceCompiles: Avoid linker warning with -fembed-bitcode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7156
2022-04-11 08:50:58 -04:00
Kitware Robot
fd957139c2 CMake Nightly Date Stamp 2022-04-11 00:01:19 -04:00
Kitware Robot
591426f5a0 CMake Nightly Date Stamp 2022-04-10 00:01:10 -04:00
Craig Scott
a10fc754a6 CheckSourceCompiles: Avoid linker warning with -fembed-bitcode
When the Apple linker sees -headerpad_max_install_names and
bitcode is enabled with a flag like -fembed-bitcode, it issues a warning
and ignores the -headerpad_max_install_names flag. This causes
unrelated compiler and linker flag checks to fail for valid flags.
In f745e0497e (CheckCompilerFlags: Catch linker warning about ignored
flags, 2022-01-03), we started detecting linker warnings, which caused
a regression for projects that were setting -fembed-bitcode in their
CMAKE_CXX_FLAGS or similar. Prevent that regression by removing
the -headerpad_max_install_names linker flag when we know it will
warn and be ignored anyway.

Fixes: #23390
Issue: #23408
2022-04-09 21:51:09 +10:00
Kitware Robot
050354d268 CMake Nightly Date Stamp 2022-04-09 00:01:24 -04:00
Kitware Robot
073660dfd9 CMake Nightly Date Stamp 2022-04-08 00:01:21 -04:00
Martin Duffy
0354865061 ccmake: Allow Vim keys in cmCursesLongMessageForm
Added support for navigation of cmCursesLongMessageForm with j and k
which affects the help and log screens.
These keys were already supported for cmCursesMainForm since commit
e34e9c2705 (ccmake: Add VIM-like bindings for navigation, 2016-07-21,
v3.7.0-rc1~295^2), adding them here for consistency.

Fixes: #5233
2022-04-07 15:06:35 -04:00
Brad King
9a7d8394b1 Merge topic 'header-sets-no-framework'
f779f8c0ad FILE_SET: Forbid adding header sets to Apple FRAMEWORK libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !7149
2022-04-07 10:54:30 -04:00
Kyle Edwards
f779f8c0ad FILE_SET: Forbid adding header sets to Apple FRAMEWORK libraries
The feature needs a specialized implementation to place headers
in the right place inside frameworks.  To avoid silently doing
the wrong thing, make this case an error for the 3.23 series.

Issue: #23386
2022-04-07 09:26:58 -04:00
Brad King
e6a200fa9f Merge topic 'fix-warnings'
75e8173322 Source: Fix clang -Wunused-but-set-variable warnings
2646d5dfcf LexerParser: Suppress clang -Wunused-but-set-variable warnings
8add899c03 LexerParser: Regenerate parsers with bison 3.8.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7147
2022-04-07 09:12:52 -04:00
Kitware Robot
f0a2ec12e2 CMake Nightly Date Stamp 2022-04-07 00:01:21 -04:00
Brad King
75e8173322 Source: Fix clang -Wunused-but-set-variable warnings 2022-04-06 16:02:05 -04:00
Brad King
2646d5dfcf LexerParser: Suppress clang -Wunused-but-set-variable warnings 2022-04-06 16:02:03 -04:00
Brad King
8add899c03 LexerParser: Regenerate parsers with bison 3.8.2 2022-04-06 16:02:03 -04:00
Kitware Robot
cbfc860e40 CMake Nightly Date Stamp 2022-04-06 00:01:24 -04:00
Brad King
eea53ea0a9 Merge topic 'xcode-xcconfig'
53ca6edd8a xcode: add support for xcconfig files
183b6bbf51 Tests: Ignore all classes in Xcode internal objc warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7119
2022-04-05 08:24:28 -04:00
Brad King
7e1095751f Merge topic 'cmake-gui-categories'
ebc1c60d43 cmake-gui: Add "Building" category to freedesktop menu spec

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7141
2022-04-05 08:23:22 -04:00
Kitware Robot
c2adb5bb0c CMake Nightly Date Stamp 2022-04-05 00:01:16 -04:00