Commit Graph

55753 Commits

Author SHA1 Message Date
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 69eb5b2421 Merge topic 'doc-list-non-existent'
b573a732dc Tests: add tests to check claims in the documentation
b151db01f9 Help: mention non-existent case for list(PREPEND)
b3a249c2cb Help: clarify range for list(INSERT), mention nonexistent / empty case
b6fdcb3df0 Help: clarify description of list(INSERT)
e55f473ea9 Help: clarify that list(APPEND) on a non-existent list creates it

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6824
2021-12-22 08:53:02 -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 b573a732dc Tests: add tests to check claims in the documentation
- list commands APPEND, PREPEND, INSERT treat non-existent
  lists as empty and use that value, creating a new list
  variable in the process.
2021-12-21 10:55:50 -05:00
Adriaan de Groot b151db01f9 Help: mention non-existent case for list(PREPEND) 2021-12-21 10:55:43 -05:00
Adriaan de Groot b3a249c2cb Help: clarify range for list(INSERT), mention nonexistent / empty case 2021-12-21 10:55:35 -05:00
Adriaan de Groot b6fdcb3df0 Help: clarify description of list(INSERT)
Since the argument is called 'index', use that in the description.
2021-12-21 10:55:32 -05:00
Adriaan de Groot e55f473ea9 Help: clarify that list(APPEND) on a non-existent list creates it
This is hinted-at in the introduction, which mentions creating
a new variable value in the current scope, but let's make it
explicit.

Fixes: #22910
2021-12-21 10:55:22 -05:00
Brad King 9d80742db4 Merge topic 'FindGLUT-include-dirs'
6fda93faf8 FindGLUT: Provide modern-named GLUT_INCLUDE_DIRS result variable
641b3f4101 FindGLUT: Modernize documentation layout
924b2999a1 FindGLUT: Move mark_as_advanced calls closer to find calls

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6820
2021-12-21 09:29:20 -05:00
Brad King 8f44a6db8e Merge branch 'release-3.22' 2021-12-21 09:28:03 -05:00
Brad King 132f45a099 Merge topic 'FindBoost-1.78'
d45667d459 FindBoost: Do not warn about now-supported version 1.78

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6819
2021-12-21 09:28:02 -05:00
Brad King a2752fd914 Merge topic 'FindBoost-1.78' into release-3.22
d45667d459 FindBoost: Do not warn about now-supported version 1.78

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6819
2021-12-21 09:28:01 -05: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 37a25072ea Tests: Rename RunCMake.{CMP0028 => LinkItemValidation}
Generalize the test name to prepare for cases beyond CMP0028.
2021-12-20 09:56:51 -05:00
Brad King 6fda93faf8 FindGLUT: Provide modern-named GLUT_INCLUDE_DIRS result variable
Previously this module only provided `GLUT_INCLUDE_DIR`, which does not
follow the modern naming convention documented in `cmake-developer(7)`.

Issue: #23018
2021-12-20 09:53:33 -05:00
Brad King 641b3f4101 FindGLUT: Modernize documentation layout 2021-12-20 09:49:55 -05:00
Brad King 924b2999a1 FindGLUT: Move mark_as_advanced calls closer to find calls 2021-12-20 09:47:41 -05:00
Brad King ece1900731 Merge topic 'doc-if-defined'
a45e922768 Help: Clarify behavior of if(DEFINED) for cache and non-cache variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6817
2021-12-20 09:44:43 -05:00
Brad King 85833461af Merge topic 'doc-CMP0126-OLD'
47168b2231 Help: Clarify CMP0126 OLD behavior for FORCE and INTERNAL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6818
2021-12-20 09:40:19 -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
Brad King 0e4d56369c Merge branch 'release-3.22' 2021-12-20 09:30:02 -05:00
Brad King b2d764fea1 Merge topic 'FindGLUT-include-dirs'
ae6b25d920 FindGLUT: Provide legacy GLUT_INCLUDE_DIR result in pkg-config code path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6814
2021-12-20 09:30:01 -05:00
Brad King c74c8b5928 Merge topic 'FindGLUT-include-dirs' into release-3.22
ae6b25d920 FindGLUT: Provide legacy GLUT_INCLUDE_DIR result in pkg-config code path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6814
2021-12-20 09:30:00 -05:00
Brad King e3ece528c8 Merge topic 'googletest-executor-error'
0f51987d42 GoogleTest: show test executor in error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6813
2021-12-20 09:23:44 -05:00
Brad King 6db5fdae4d Merge topic 'FindGSL-version-regex'
58f2708b90 FindGSL: Improve version extraction regex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6812
2021-12-20 09:22:27 -05:00
Brad King f5f73e5ac1 Merge topic 'test-vsnormal-allow-intel'
d7ae61cde6 Tests: In RunCMake.GeneratorToolset accept Intel platform toolsets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6811
2021-12-20 09:21:33 -05:00
Brad King d45667d459 FindBoost: Do not warn about now-supported version 1.78
In commit d176ff71c0 (FindBoost: Add support for Boost 1.78, 2021-12-15)
we forgot to update the future-version check.

Issue: #23016
2021-12-20 09:03:54 -05:00
Craig Scott 47168b2231 Help: Clarify CMP0126 OLD behavior for FORCE and INTERNAL
Fixes: #23022
2021-12-20 21:24:50 +11:00
Craig Scott a45e922768 Help: Clarify behavior of if(DEFINED) for cache and non-cache variables
Fixes: #23023
2021-12-20 19:27:39 +11: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 ae6b25d920 FindGLUT: Provide legacy GLUT_INCLUDE_DIR result in pkg-config code path
Since commit f90d15458a (FindGLUT: Use pkg-config to find flags if
available, 2021-06-11, v3.22.0-rc1~469^2) we return early if pkg-config
provides the information.  During review of that commit, code to
populate the legacy `GLUT_INCLUDE_DIR` result variable was removed from
that code path.  Add code to provide it.

Also fix the test case to use `GLUT_INCLUDE_DIR`, the result variable
documented officially by the module.

Fixes: #23018
2021-12-17 15:17:29 -05:00
Paul-Antoine Arras 0f51987d42 GoogleTest: show test executor in error message
Fixes: #22920
2021-12-17 16:50:12 +01:00
مهدي شينون (Mehdi Chinoune) 58f2708b90 FindGSL: Improve version extraction regex
Fixes: #23017
2021-12-17 09:32:17 -05:00
William R. Dieter d7ae61cde6 Tests: In RunCMake.GeneratorToolset accept Intel platform toolsets
The RunCMake.GeneratorToolset test expected platform toolsets to have a
name beginning with 'v' followed by one or more decimal digits, as all
the Microsoft platform toolsets follow that naming convention.
The Intel platform toolsets begin with "Intel" and have various
additional strings depending on the compiler version.

This change accepts the toolsets delivered by Intel in addition to those
from Microsoft.

Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
2021-12-17 09:27:17 -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
Brad King 6c946fba65 Merge branch 'release-3.22' 2021-12-17 08:54:54 -05:00
Brad King be948f7150 Merge topic 'FindBoost-python-3.10'
d4bb6c0c7f FindBoost: Add support for Python 3.10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6809
2021-12-17 08:54:53 -05:00