summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* generated-cmake: use `_cmake_` prefixes for local variablesBen Boeckel2022-04-203-37/+37
| | | | This avoids stomping on any user variables.
* cmExportFileGenerator: require CMake 2.8.3Ben Boeckel2022-04-201-3/+6
| | | | | | | | This allows use of `CMAKE_CURRENT_LIST_DIR`, `foreach(IN LISTS)`, `if(VERSION_*)`, and more. Note that generated filesets code already uses `if(VERSION_*)` and requires CMake 2.8.3 in practice.
* Merge topic 'cpack-dmg-sla'Brad King2022-04-2015-6/+91
|\ | | | | | | | | | | | | | | 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
| * CPack/DMG: Do not use CPACK_RESOURCE_FILE_LICENSE for SLA by defaultBrad King2022-04-1415-6/+91
| | | | | | | | | | | | | | | | 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
* | Merge topic 'vs-dotnet-startup-object'Brad King2022-04-2011-0/+112
|\ \ | | | | | | | | | | | | | | | | | | d89af11f89 VS: Add StartupObject property for managed .NET projects Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7171
| * | VS: Add StartupObject property for managed .NET projectsFlorian Schweiger2022-04-1211-0/+112
| | |
* | | Merge topic 'cmake-gui-font'Brad King2022-04-201-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 072b318893 cmake-gui: avoid undefined font in recent macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7178
| * | | cmake-gui: avoid undefined font in recent macOSCarlo Marcelo Arenas Belón2022-04-151-1/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge topic 'command-line-argument-bool'Brad King2022-04-203-76/+71
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Refactor: Use cmCommandLineArgument::setTo{True,Value}()Kyle Edwards2022-04-182-76/+21
| | | |
| * | | cmCommandLineArgument: Add setToTrue() and setToValue() helpersKyle Edwards2022-04-181-0/+50
| | | |
* | | | Merge branch 'release-3.23'Brad King2022-04-200-0/+0
|\ \ \ \
| * \ \ \ Merge topic 'target-runtime-dlls-doc' into release-3.23Brad King2022-04-201-7/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 692aacfc72 Help: Remove references to MODULE in $<TARGET_RUNTIME_DLLS> doc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7186
* | \ \ \ \ Merge topic 'target-runtime-dlls-doc'Brad King2022-04-201-7/+7
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 692aacfc72 Help: Remove references to MODULE in $<TARGET_RUNTIME_DLLS> doc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7186
| * | | | | Help: Remove references to MODULE in $<TARGET_RUNTIME_DLLS> docKyle Edwards2022-04-191-7/+7
| |/ / / /
* | | | | CMake Nightly Date StampKitware Robot2022-04-201-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2022-04-191-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2022-04-181-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2022-04-171-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2022-04-161-1/+1
| |/ / / |/| | |
* | | | Merge branch 'release-3.23'Brad King2022-04-150-0/+0
|\ \ \ \ | |/ / /
| * | | Merge topic 'CPackIFW-extra-dot' into release-3.23Brad King2022-04-151-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ Merge topic 'CPackIFW-extra-dot'Brad King2022-04-151-3/+3
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | CPackIFW: Fix regression in icon file namesJean-Philippe Lebel2022-04-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge branch 'release-3.23'Brad King2022-04-150-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'file-set-generated-dependency' into release-3.23Brad King2022-04-156-2/+33
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge topic 'file-set-generated-dependency'Brad King2022-04-156-2/+33
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | FILE_SET: Make INTERFACE libraries with HEADER_SETS participate in buildsystemKyle Edwards2022-04-146-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | CMake Nightly Date StampKitware Robot2022-04-151-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'export-missing-targets'Brad King2022-04-1411-157/+117
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | cmExportFileGenerator: Simplify collection of targets missing from export setBrad King2022-04-1111-157/+117
| | | | | | | | | | | | | | | | | | | | | | | | | Store the list of missing target names in a member instead of threading an explicit reference to it through the call stack.
* | | | | Merge topic 'vswhere-support'Brad King2022-04-142-56/+129
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f85913fa08 VS: Add support for enumerating VS instances with vswhere 069cff63f6 VS: refactor EnumerateAndChooseVSInstance Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7159
| * | | | | VS: Add support for enumerating VS instances with vswhereNiyas Sait2022-04-132-2/+58
| | | | | |
| * | | | | VS: refactor EnumerateAndChooseVSInstanceNiyas Sait2022-04-112-56/+73
| |/ / / / | | | | | | | | | | | | | | | | | | | | Move all VS instance enumeration code using COM interface to EnumerateVSInstancesWithCOM
* | | | | Merge topic 'xcode-universal'Brad King2022-04-1415-13/+65
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Xcode: Add tests for OBJECT library per target `OSX_ARCHITECTURES`Hyper Nova Sun2022-04-126-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added test to cover handling of when `CMAKE_OSX_ARCHITECTURES` differs from OBJECT library target's `OSX_ARCHITECTURES`: TargetOverrideSingleArch: - When `CMAKE_OSX_ARCHITECTURES` is set to multiple archs, - But OBJECT library's `OSX_ARCHITECTURES` is set to single - Assert that OBJECT library target "`HasKnownObjectFileLocation`" and is installable TargetOverrideMultiArch: - When `CMAKE_OSX_ARCHITECTURES` is set to single arch, - But OBJECT library's `OSX_ARCHITECTURES` is set to multiple - Assert that OBJECT library target does not "`HasKnownObjectFileLocation`" and hence not installable
| * | | | | Xcode: Check for multiple `OSX_ARCHITECTURES` on targetHyper Nova Sun2022-04-111-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | cmTarget: Add `HasKnownObjectFileLocation()` shorthandHyper Nova Sun2022-04-119-11/+21
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow `cmGlobalGenerator`s to decide `HasKnownObjectFileLocation()` per given `cmTarget` - `cmGlobalGenerator::HasKnownObjectFileLocation()` now takes an optional `cmGeneratorTarget` - `cmTarget::HasKnownObjectFileLocation()` added as a shorthand
* | | | | Merge topic 'list_presets'Brad King2022-04-142-8/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | cmCMakePresetsGraph: do not set default value for TestOutputTruncationFrank Winklmeier2022-04-122-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `TestOutputTruncation` is an optional preset. Do not set a default value to avoid failing the JSON schema version check. Closes issue #23411.
* | | | | | Merge topic 'cmake_host_system_information-query-windows-registry'Brad King2022-04-1433-3/+1073
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 17ff86547e cmake_host_system_information: query windows registry Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7155
| * | | | | | cmake_host_system_information: query windows registryMarc Chevrier2022-04-1333-3/+1073
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21240, #23367
* | | | | | | Merge topic 'FindGit-no-easygit'Brad King2022-04-141-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b656a3fa16 FindGit: remove EasyGit Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7169
| * | | | | | | FindGit: remove EasyGitMichael Hirsch2022-04-111-3/+3
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Blame shows EasyGit was part of initial FindGit 11 years ago. I can hardly find Easy Git as a package. Given that Git is vital for many complex CMake projects, it seems good to ensure CMake FindGit is finding a Git program likely to work. Crucial CMake modules like FetchContent also use FindGit, emphasizing the importance of having a Git executable with proper functionality.
* | | | | | | Merge branch 'release-3.23'Brad King2022-04-140-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge topic 'ci-cmake-update' into release-3.23Brad King2022-04-142-6/+6
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca4d5d366d ci: use CMake 3.23.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7172
* | | | | | | Merge topic 'ci-cmake-update'Brad King2022-04-142-6/+6
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca4d5d366d ci: use CMake 3.23.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7172
| * | | | | | ci: use CMake 3.23.1Brad King2022-04-122-6/+6
| |/ / / / /
* | | | | | CMake Nightly Date StampKitware Robot2022-04-141-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2022-04-131-1/+1
| | | | | |