Commit Graph

31764 Commits

Author SHA1 Message Date
Brad King
2294553070 Merge topic 'refactor_vsproject_type'
3b7520b94d Consolidate usage of VsProjectType
938a53f4f1 Refactor VsProjectType to its own header

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6830
2022-01-07 09:39:22 -05:00
Brad King
11b0ab1672 Merge topic 'cpack-pkg-domains'
da737d34e0 CPack/productbuild: add options to control domains element

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6825
2022-01-07 09:38:30 -05:00
Kitware Robot
5dd953ca2c CMake Nightly Date Stamp 2022-01-07 00:01:12 -05:00
David Wosk
da737d34e0 CPack/productbuild: add options to control domains element
The domains element determines the required authorization level needed
for the install. The auth attribute of the pkg-ref element has been
deprecated in favor of domains, so if the domains options are
specified, the auth attribute is omitted.

Fixes: #23030
2022-01-06 11:33:25 -05:00
Brad King
ac892a64a9 Merge topic 'xcode-framework-system-includes'
7d99cff236 Xcode: Properly identify frameworks with system includes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6815
2022-01-06 10:12:26 -05:00
Kitware Robot
2f244b4cb8 CMake Nightly Date Stamp 2022-01-06 00:01:07 -05:00
Kitware Robot
353318cc53 CMake Nightly Date Stamp 2022-01-05 00:01:08 -05:00
Kitware Robot
0537be19fd CMake Nightly Date Stamp 2022-01-04 00:01:11 -05:00
Craig Scott
f940c833dc Merge topic 'cmMachO_h_missing_header'
a1ca50d9fc cmMachO: Add missing header for std::unique_ptr

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6835
2022-01-03 16:51:18 -05:00
Kitware Robot
65b1b51983 CMake Nightly Date Stamp 2022-01-03 00:01:24 -05:00
Craig Scott
a1ca50d9fc cmMachO: Add missing header for std::unique_ptr
Builds were previously relying on <memory> being included
by <string>, but not all compilers do that and we shouldn't
be relying on that anyway.
2022-01-02 21:15:19 +11:00
Kitware Robot
f96729e80c CMake Nightly Date Stamp 2022-01-02 00:01:07 -05:00
Kitware Robot
5c09fe0283 CMake Nightly Date Stamp 2022-01-01 00:01:07 -05:00
Kitware Robot
b3ae5bfba7 CMake Nightly Date Stamp 2021-12-31 00:01:14 -05:00
Kitware Robot
0876d54eed CMake Nightly Date Stamp 2021-12-30 00:01:08 -05:00
Kitware Robot
90c83564f0 CMake Nightly Date Stamp 2021-12-29 00:01:08 -05:00
Kitware Robot
6f6b00d1f4 CMake Nightly Date Stamp 2021-12-28 00:01:06 -05:00
Kitware Robot
2acddd2660 CMake Nightly Date Stamp 2021-12-27 00:01:18 -05:00
Kitware Robot
a0efad76ab CMake Nightly Date Stamp 2021-12-26 00:01:07 -05:00
Kitware Robot
02ec22472f CMake Nightly Date Stamp 2021-12-25 00:01:06 -05:00
Kitware Robot
71ef68ef96 CMake Nightly Date Stamp 2021-12-24 00:01:07 -05:00
Sumit Bhardwaj
3b7520b94d Consolidate usage of VsProjectType
Move ProjectFileExtension handling logic to use ProjectType and remove
extraneous checks in .Net SDK style project generation. This change will
make introducing new project types relatively simpler.
2021-12-23 15:53:04 -08:00
Sumit Bhardwaj
938a53f4f1 Refactor VsProjectType to its own header
Move VsProject to its own header so that we can consolidate IsManaged
and IsCSharp.
2021-12-23 11:53:39 -08:00
Kitware Robot
26ab790820 CMake Nightly Date Stamp 2021-12-23 00:01:11 -05:00
Brad King
138aabfa9d Merge topic 'vs-csharp-dotnet-sdk'
0eea32a376 VS: Add DOTNET_SDK property to generate SDK-style C# projects
a450cc9533 VS: Set ResolveNugetPackages to false for ALL_BUILD and ZERO_CHECK
fa76e5d194 cmVisualStudio10TargetGenerator: Factor out helper for classic MSBuild project

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6634
2021-12-22 08:56:22 -05:00
Brad King
7a07d089b9 Merge topic 'cpack-freebsd-pkg'
c3715e08e4 FreeBSD: tidy up
a76f19d5e8 FreeBSD: handle new package-file-suffix
d5ae2f9754 FreeBSD: fix up the package name
0ac1ac798e FreeBSD: migrate to newer pkg_create(3) API

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Semphriss <dev.semphris@gmail.com>
Merge-request: !5854
2021-12-22 08:53:54 -05:00
Brad King
217f363cac Merge topic 'link-only-targets'
37af6c3311 target_link_libraries: Optionally require only target names
5134f099a3 cmGeneratorTarget: Factor out message about reasons for a missing target
37a25072ea Tests: Rename RunCMake.{CMP0028 => LinkItemValidation}

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6821
2021-12-22 08:52:13 -05:00
Gregor Jasny
7d99cff236 Xcode: Properly identify frameworks with system includes
Check the complete include path for being a system include, not
the derived framework search path. The code for Ninja and Makefile
generators does exactly the same.

Fixes: #23011
2021-12-22 11:38:52 +01:00
Kitware Robot
68b0c62a72 CMake Nightly Date Stamp 2021-12-22 00:01:14 -05:00
Sumit Bhardwaj
0eea32a376 VS: Add DOTNET_SDK property to generate SDK-style C# projects
Changes in cmVisualStudio10TargetGenerator::Generate to write .Net
SDK-style project for VS generators VS 19 and above. Also adds
documentation and tests.

Issue: #20227
2021-12-21 09:35:49 -08:00
Adriaan de Groot
c3715e08e4 FreeBSD: tidy up
- mismatched comments and code,
- remove superfluous log of the "Real package" (which can
  still change! log the changed filename if it does),
- the "fix up the package name" code was replacing the
  pkg 1.17 suffix by the pkg 1.17 suffix, so it wasn't
  really being useful. Whether **any** of the backwards-
  compatibility packaging code is useful is another thing.
2021-12-21 14:29:59 +01:00
Adriaan de Groot
a76f19d5e8 FreeBSD: handle new package-file-suffix 2021-12-21 13:59:27 +01:00
Adriaan de Groot
d5ae2f9754 FreeBSD: fix up the package name
When using libpkg, the output filename is determined by libpkg
itself, based on information in the manifest: package name and
version, basically. This doesn't necessarily match the name that
CMake has determined via CPACK_TEMPORARY_PACKAGE_FILE_NAME or
CPACK_PACKAGE_FILE_NAME. So reset the CMake-determined list
to match what libpkg will do.
2021-12-21 13:59:27 +01:00
Adriaan de Groot
0ac1ac798e FreeBSD: migrate to newer pkg_create(3) API
The pkg_create_from_manifest() function was never really intended as
stable API, and bapt@ has asked me to stop using it so the public
API can be stabilized.

Port to pkg_create() with its attendant settings struct.
Since we already have a complete manifest file, we can hand
that (including the embedded plist) to pkg_create().

While here, reintroduce pkg_init(), which lived in downstream patches
for a while and then went away again.
2021-12-21 13:59:27 +01:00
Kitware Robot
6afe949658 CMake Nightly Date Stamp 2021-12-21 00:01:13 -05:00
Brad King
37af6c3311 target_link_libraries: Optionally require only target names
Optionally verify that items in `LINK_LIBRARIES` and
`INTERFACE_LINK_LIBRARIES` that can be target names are actually target
names.  Add a `LINK_LIBRARIES_ONLY_TARGETS` target property and
corresponding `CMAKE_LINK_LIBRARIES_ONLY_TARGETS` variable to enable
this new check.

Fixes: #22858
2021-12-20 12:14:07 -05:00
Brad King
5134f099a3 cmGeneratorTarget: Factor out message about reasons for a missing target 2021-12-20 09:56:52 -05:00
Brad King
af9fcbd006 Merge topic 'improve-CMP0028-messages'
ea050286e7 CMP0028: Report the target whose link interface has an offending item
a97c92e46e CMP0028: Report backtrace to link item rather than target creation
0dcbf4ab58 cmGeneratorTarget: Record when imported target link iface libs are done

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6810
2021-12-20 09:32:42 -05:00
Kitware Robot
6b5c836252 CMake Nightly Date Stamp 2021-12-20 00:02:10 -05:00
Kitware Robot
23f5588a7b CMake Nightly Date Stamp 2021-12-19 00:02:40 -05:00
Kitware Robot
1fdff77fa5 CMake Nightly Date Stamp 2021-12-18 00:02:00 -05:00
Brad King
3930c354f8 Merge topic 'vs-csproj-scripts'
aca153b104 VS: Add custom VCEnd labels only in C# projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6808
2021-12-17 08:58:30 -05:00
Brad King
594f81966d Merge topic 'filter-debug-find'
d7b18895bc cmake: Add filtered debug-find options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !6778
2021-12-17 08:56:37 -05:00
John Parent
d7b18895bc cmake: Add filtered debug-find options
Add a `--debug-find-pkg=` option to debug find calls for specific
packages.

Add a `--debug-find-var=` option to debug find calls for specific
return variables.

Fixes: #21880
2021-12-17 08:55:21 -05:00
Kitware Robot
393dbe7ea1 CMake Nightly Date Stamp 2021-12-17 00:01:09 -05:00
Brad King
ea050286e7 CMP0028: Report the target whose link interface has an offending item
Previously items linked via the link interface of a dependency were
reported in CMP0028 messages as if directly linked by a target.
Clarify the messages to indicate that an offending item is actually
in the link interface of a given target, regardless of its consumer.

Move the check to the end of generation and look through the final set
of link implementations and link interfaces that were used for
generation.  This avoids repeating messages on link interfaces that
have multiple consumers.
2021-12-16 16:43:17 -05:00
Sumit Bhardwaj
aca153b104 VS: Add custom VCEnd labels only in C# projects
In commit dff98aa9ca (VS: add missing label in C# project-build events,
2021-12-15) the condition for adding our own `VCEnd` label was based on
the project being managed or not.  Since we support managed C++
projects, switch the condition to be based on whether the project is C#.

Issue: #21440
2021-12-16 15:31:14 -05:00
Brad King
a97c92e46e CMP0028: Report backtrace to link item rather than target creation
Now that we have proper backtraces for both `LINK_LIBRARIES` and
`INTERFACE_LINK_LIBRARIES` entries, we can report them in error
messages.
2021-12-16 12:45:27 -05:00
Brad King
0dcbf4ab58 cmGeneratorTarget: Record when imported target link iface libs are done
`GetImportLinkInterface` populates the link interface from properties
of imported targets.  Make it more closely match the link interface
of in-project targets by recording the `LibrariesDone` field.
2021-12-16 10:39:41 -05:00
Brad King
d5026daa9e Merge topic 'link-interface-backtrace'
1d709ea2f5 cmGeneratorTarget: Propagate backtraces from INTERFACE_LINK_LIBRARIES
a84a62e0a7 cmTarget: Record backtraces for INTERFACE_LINK_LIBRARIES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6805
2021-12-16 10:38:56 -05:00