Commit Graph

56519 Commits

Author SHA1 Message Date
Michael Hirsch ca2877c039 FindPython: add support for Python 3.12 2022-05-12 10:55:11 -04:00
Brad King 2019bf5092 Merge topic 'doc-package-compatibility-mode' into release-3.23
a82163839a CMakePackageConfigHelpers: Fix note about version files supporting ranges

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7254
2022-05-12 09:28:15 -04:00
friendlyanon a82163839a CMakePackageConfigHelpers: Fix note about version files supporting ranges
In commit 55c3b6a77e (CMakePackageConfigHelpers: Relax restrictions on
version range, 2019-05-30, v3.20.0-rc1~295^2~1) the documentation for
write_basic_package_version_file documented the support of version
ranges by the generated version files, however the note wrongly
specifies a COMPATIBILITY_MODE argument, instead of COMPATIBILITY.
2022-05-11 14:00:38 -04:00
Brad King cc207014cf Merge topic 'Java-version-handling' into release-3.23
93e18a4eb6 FindJava, FindJNI: ensure correct handling of versions on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7241
2022-05-06 08:57:24 -04:00
Marc Chevrier 93e18a4eb6 FindJava, FindJNI: ensure correct handling of versions on Windows
* versions are sorted in correct order
* EXACT keyword is taken into account

Fixes: #23479
2022-05-05 11:14:52 +02:00
Brad King 6ce2e0b5f9 Merge topic 'FindPython-fix-typo-error' into release-3.23
fff8d5b212 FindPython: fix typo error

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7233
2022-05-04 11:07:09 -04:00
Brad King 28957f7f25 Merge topic 'avoid-remove-empty-path' into release-3.23
71ded12a75 cmGeneratedFileStream: Do not remove empty path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7223
2022-05-03 11:25:08 -04:00
Brad King 4a215d292f Merge topic 'restore-CPACK_PACKAGEMAKER_CHOICES' into release-3.23
d099136add productbuild: Restore CPACK_PACKAGEMAKER_CHOICES variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7220
2022-05-03 11:24:10 -04:00
Marc Chevrier fff8d5b212 FindPython: fix typo error
Fixes: #23476
2022-05-03 10:46:13 +02:00
Brad King 71ded12a75 cmGeneratedFileStream: Do not remove empty path
If `Close()` is called when a file was never opened, we have no
temporary file path.  Do not try to remove it.  Some implementations of
`unlink()` crash on an empty path (though the documented behavior is to
fail with `ENOENT`).

Fixes: #23414
2022-04-29 11:56:59 -04:00
Craig Scott d099136add productbuild: Restore CPACK_PACKAGEMAKER_CHOICES variable
In 2a8df7e7db (productbuild: Don't write rootVolumeOnly attribute if
writing domains, 2022-03-21), the variable holding the main contents
of the distribution.dist XML file was renamed from
CPACK_PACKAGEMAKER_CHOICES to CPACK_APPLE_PKG_INSTALLER_CONTENT.
This reflected the fact that the PackageMaker generator is deprecated.
The new variable also includes more details than the old one held.
Some projects were relying on the old variable name, so we need to still
set that to the same contents as it would have previously provided.

Neither of these variables were previously documented, but the older
variable was mentioned in enough semi-official places that it essentially
became semi-supported. Document both variables and highlight that the
older one is deprecated.

Fixes: #23467
2022-04-30 00:28:05 +10:00
Brad King a8c8842101 Merge topic 'doc-cmake.org-tutorial-archive' into release-3.23
4cb616fed6 Tutorial: Provide a source archive when published on cmake.org
37fb70591e Utilities/Sphinx: Add variables listing pre-sphinx commands
eb7d913a21 Utilities/Sphinx: Clarify names of variables listing post-sphinx commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7215
2022-04-29 09:26:16 -04:00
Brad King 4cb616fed6 Tutorial: Provide a source archive when published on cmake.org
Provide readers following the tutorial on `cmake.org` a direct link to
download the tutorial's source examples.  Previously readers had to
fetch the CMake source tree separately and look for the tutorial source
examples inside it.

Fixes: #22475
2022-04-28 13:36:20 -04:00
Brad King 37fb70591e Utilities/Sphinx: Add variables listing pre-sphinx commands 2022-04-27 15:22:31 -04:00
Brad King eb7d913a21 Utilities/Sphinx: Clarify names of variables listing post-sphinx commands 2022-04-27 15:22:31 -04:00
Brad King 74c4762a38 Merge topic 'FindBoost-1.79' into release-3.23
f90fb73651 FindBoost: Add support for Boost 1.79

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7205
2022-04-27 08:43:48 -04:00
Brad King f90fb73651 FindBoost: Add support for Boost 1.79
Update the list of known versions.

Run the command

    cmake -DBOOST_DIR=/path/to/boost_1_79_0 \
      -P Utilities/Scripts/BoostScanDeps.cmake

to extract dependencies from the 1.79.0 source tree.
They are the same as 1.78's dependencies, so just update
the version check for warning about newer versions.

Fixes: #23452
2022-04-26 11:23:16 -04:00
Brad King 7ba4d289c9 Merge branch 'release-3.22' into release-3.23 2022-04-26 11:13:27 -04:00
Brad King ad5bf708a6 Merge branch 'release-3.21' into release-3.22 2022-04-26 11:13:18 -04:00
Brad King 7e4d6bbe02 Merge topic 'ci-xcode-13.3' into release-3.23
65b6daf776 gitlab-ci: update macOS jobs to use Xcode 13.3
94361a1309 Tests: Ignore all classes in Xcode internal objc warnings
da9f864513 Tests: Teach RunCMake to ignore Xcode extension point warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7204
2022-04-26 11:12:51 -04:00
Brad King f48047251f Merge branch 'ci-xcode-13.3' into release-3.22
Merge-request: !7204
2022-04-26 11:12:28 -04:00
Brad King adcb98c51b Merge branch 'ci-xcode-13.3' into release-3.21
Merge-request: !7204
2022-04-26 11:12:02 -04:00
Brad King 65b6daf776 gitlab-ci: update macOS jobs to use Xcode 13.3 2022-04-25 15:52:15 -04:00
Gregor Jasny 94361a1309 Tests: Ignore all classes in Xcode internal objc warnings
Xcode on Apple Silicon warns not only about AMSupportURL classes
but also many more.
2022-04-25 15:52:15 -04:00
Brad King da9f864513 Tests: Teach RunCMake to ignore Xcode extension point warnings
On some Xcode versions, `xcodebuild` may warn:

    ... xcodebuild[...] Requested but did not find extension point with
                        identifier ...

Teach RunCMake to drop such incidental lines before matching against
expected output.
2022-04-25 14:35:11 -04:00
Brad King ddefed68e5 Merge topic 'CheckCompilerFlags-revert-linker-warnings' into release-3.23
4941887d7d CheckCompilerFlags: Revert "Catch linker warning about ignored flags"
c2341ece47 CheckLinkerFlag: Catch linker warning when the checked flag is ignored

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7190
2022-04-22 08:55:56 -04:00
Brad King 32eba762be Merge topic 'wrong-header-referenced-in-guide' into release-3.23
27589da705 Help/guide: Fix wrong header file reference

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7196
2022-04-22 08:54:23 -04:00
Martin Duffy 27589da705 Help/guide: Fix wrong header file reference
Step 2 references mysqrt.h instead of MathFunctions.h.
MathFunctions/mysqrt.h doesn't exist until Step 9.
2022-04-21 14:25:06 -04:00
Brad King 7717848f9e Merge topic 'FindPython-pypy-v7.3.9-support' into release-3.23
5440eafaae FindPython: Add support for pypy v7.3.9 and uppers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7189
2022-04-21 11:50:27 -04:00
Brad King c4f35d4077 Merge topic 'file-set-build-export' into release-3.23
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:39 -04:00
Brad King 4941887d7d CheckCompilerFlags: Revert "Catch linker warning about ignored flags"
Revert commit f745e0497e (CheckCompilerFlags: Catch linker warning about
ignored flags, 2022-01-03, v3.23.0-rc1~174^2).  It regressed cases where
incidental linker warnings were previously tolerated.  Revert the change
pending further investigation.

Fixes: #23432
Issue: #22961
2022-04-21 11:36:21 -04:00
Brad King c2341ece47 CheckLinkerFlag: Catch linker warning when the checked flag is ignored
Prior to commit 219dde4ea8 (CheckPIESupported: now uses any SYSROOT settings,
2022-01-16, v3.23.0-rc1~110^2), the checks for `-pie` and `-no_pie` on macOS
failed due to executing the compiler directly without any `-isysroot`,
producing `ld: library not found for -lc++`.  See issues #23053 and #19180.
The failing check for `-pie` was a bug because it is supported on macOS,
both for `x86_64` and `arm64`, and the commit fixed that check.

However, `-no_pie` is not supported on macOS `arm64`.  The above commit was
only able to detect that due to commit f745e0497e (CheckCompilerFlags: Catch
linker warning about ignored flags, 2022-01-03, v3.23.0-rc1~174^2), which we
need to revert due to issue #23432.  Instead, catch only the linker warning
about the exact flag being checked.
2022-04-21 11:35:30 -04:00
Brad King 75d2faae52 Merge topic 'target-runtime-dlls-doc' into release-3.23
692aacfc72 Help: Remove references to MODULE in $<TARGET_RUNTIME_DLLS> doc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7186
2022-04-20 11:29:09 -04:00
Marc Chevrier 5440eafaae FindPython: Add support for pypy v7.3.9 and uppers
Library name versioning has changed.

Fixes: #23439
2022-04-20 15:29:50 +02:00
Kyle Edwards 692aacfc72 Help: Remove references to MODULE in $<TARGET_RUNTIME_DLLS> doc 2022-04-19 12:45:22 -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
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
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 475d6ab002 Merge topic 'file-set-generated-dependency' into release-3.23
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:56 -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 5b2e097fbf Merge topic 'ci-cmake-update' into release-3.23
ca4d5d366d ci: use CMake 3.23.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7172
2022-04-14 09:22:34 -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
Brad King ca4d5d366d ci: use CMake 3.23.1 2022-04-12 13:15:15 -04:00
Brad King efe08e2894 CMake 3.23.1 v3.23.1 2022-04-12 10:06:39 -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 22563164a8 Merge branch 'release-3.22' into release-3.23 2022-04-12 09:50:19 -04:00
Brad King 07d351b535 CMake 3.22.4 v3.22.4 2022-04-12 09:06:27 -04:00
Brad King 5fa15ec9f3 Help: Document that target_sources defines [INTERFACE_]HEADER_SETS 2022-04-12 08:47:45 -04:00
Brad King 8fd65bef7d Merge topic 'doc-CheckPIESupported' into release-3.23
91c859d1e5 CheckPIESupported: Prevent separate output lines running together
ab5455aa79 Help: Correct/add missing details for CheckPIESupported

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7157
2022-04-12 08:18:09 -04:00
Brad King b77fd6da49 Merge topic 'FindPostgreSQL-14' into release-3.23
23671318f3 FindPostgreSQL: add support for PostgreSQL 14

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7158
2022-04-12 08:17:15 -04:00