mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-14 13:30:29 -05:00
Code Issues Packages Projects Releases Wiki Activity
57,207 Commits 2 Branches 393 Tags
bd8acc3a1bb190cf47fc7be6a8656eaa4feacb7c
Commit Graph

32248 Commits

Author SHA1 Message Date
Brad King
8e666c2027 Merge topic 'ghs-rerun-cmake-fix' 
1de3382de5 GHS: Fix RERUN_CMAKE issue when generation step fails

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7183
 2022-04-22 09:00:07 -04:00
Brad King
1bd85e8f3f Merge topic 'NO_CMAKE_INSTALL_PREFIX' 
42f7e39789 Find: Support per call disabling of CMAKE_INSTALL_PREFIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7163
 2022-04-22 08:59:09 -04:00
Kitware Robot
bcf0b79d66 CMake Nightly Date Stamp 2022-04-22 00:01:18 -04:00
Brad King
89ede9c3e4 Merge topic 'cpack-command-line-arguments' 
87c762d435 CPack: Use cmCommandLineArgument instead of cmsys::CommandLineArguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7185
 2022-04-21 11:54:36 -04:00
Brad King
49c96c6508 Merge topic 'file-set-build-export' 
9ee47188c0 cmExportBuildFileGenerator: handle genex-wrapped source paths
60fab8a6e0 cmInstallCommand: tweak error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7182
 2022-04-21 11:49:40 -04:00
Kitware Robot
cd22d5f419 CMake Nightly Date Stamp 2022-04-21 00:01:17 -04:00
Kyle Edwards
87c762d435 CPack: Use cmCommandLineArgument instead of cmsys::CommandLineArguments 2022-04-20 11:45:28 -04:00
Brad King
722e4d4619 Merge topic 'cpack-dmg-sla' 
b760828d3f CPack/DMG: Do not use CPACK_RESOURCE_FILE_LICENSE for SLA by default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7176
 2022-04-20 11:38:15 -04:00
Brad King
ac68695b94 Merge topic 'vs-dotnet-startup-object' 
d89af11f89 VS: Add StartupObject property for managed .NET projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7171
 2022-04-20 11:35:03 -04:00
Brad King
686df6e136 Merge topic 'cmake-gui-font' 
072b318893 cmake-gui: avoid undefined font in recent macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7178
 2022-04-20 11:30:57 -04:00
Brad King
1d5285887c Merge topic 'command-line-argument-bool' 
62f4a41647 Refactor: Use cmCommandLineArgument::setTo{True,Value}()
0645d08c98 cmCommandLineArgument: Add setToTrue() and setToValue() helpers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !7181
 2022-04-20 11:30:05 -04:00
Kitware Robot
5ea743e759 CMake Nightly Date Stamp 2022-04-20 00:01:12 -04:00
Kitware Robot
33a847c84d CMake Nightly Date Stamp 2022-04-19 00:01:08 -04:00
Kyle Edwards
62f4a41647 Refactor: Use cmCommandLineArgument::setTo{True,Value}() 2022-04-18 16:22:51 -04:00
Kyle Edwards
0645d08c98 cmCommandLineArgument: Add setToTrue() and setToValue() helpers 2022-04-18 16:22:39 -04:00
Ben Boeckel
9ee47188c0 cmExportBuildFileGenerator: handle genex-wrapped source paths 
Previously a fileset with `$<$<CONFIG:Debug>:some_file>` would show up
as-is (with escaping) in the build directory export. Instead, evaluate
all fileset entries as generator expressions and list them as they are
similar to the installation information.
 2022-04-18 13:43:18 -04:00
Kitware Robot
993ba4b688 CMake Nightly Date Stamp 2022-04-18 00:01:34 -04:00
Kitware Robot
42b486ab34 CMake Nightly Date Stamp 2022-04-17 00:01:10 -04:00
Fred Baksik
1de3382de5 GHS: Fix RERUN_CMAKE issue when generation step fails 
Fixes: 23435
 2022-04-16 07:54:46 -04:00
Kitware Robot
c279845ee7 CMake Nightly Date Stamp 2022-04-16 00:01:21 -04:00
Ben Boeckel
60fab8a6e0 cmInstallCommand: tweak error message 
Not all filesets need to be installed; just those that are visible on
the target's interface. Clarify the error message.
 2022-04-15 20:44:53 -04:00
Robert Maynard
42f7e39789 Find: Support per call disabling of CMAKE_INSTALL_PREFIX 
Fixes #23359
 2022-04-15 09:33:55 -04:00
Carlo Marcelo Arenas Belón
072b318893 cmake-gui: avoid undefined font in recent macOS 
Since commit 8fb74f97ef (ENH: Use fixed pitch font in output window,
2008-03-07), cmake-gui has been using a "Courier" font to print mono
spaced text in the output window, but at least in macOS 12, Courier
is no longer availablemand therefore will print the following warning
in the invoking terminal:

    qt.qpa.fonts: Populating font family aliases took 175 ms. Replace uses of missing font family "Courier" with one that exists to avoid this cost.

Change it to use "Courier New" instead, which has been provided as an
automatically selected alternative in Windows and comes preinstalled
in both systems, and add a hint to pull another monospaced font if not.
 2022-04-15 08:33:40 -04:00
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
33c6d01e82 Merge topic 'CPackIFW-extra-dot' into release-3.23 
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:48 -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
Brad King
b760828d3f CPack/DMG: Do not use CPACK_RESOURCE_FILE_LICENSE for SLA by default 
Since macOS 12.0 deprecated the tools needed to attach a SLA to a
`.dmg`, we should no longer do this by default.  Add a policy to
change the default to off.

Fixes: #22978
 2022-04-14 10:14:58 -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
Florian Schweiger
d89af11f89 VS: Add StartupObject property for managed .NET projects 2022-04-12 15:35:17 +02: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