summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'link-iface-usage-reqs-only'Brad King2021-12-104-53/+69
|\ | | | | | | | | | | | | | | 1e49880472 cmGeneratorTarget: Avoid boolean trap in usage requirement lookup Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6796
| * cmGeneratorTarget: Avoid boolean trap in usage requirement lookupBrad King2021-12-094-53/+69
| | | | | | | | | | Replace `bool usage_requirements_only` arguments with a proper enumeration to clarify meaning at call sites.
* | Merge topic 'ci-nmake-jom'Brad King2021-12-101-0/+7
|\ \ | | | | | | | | | | | | | | | | | | 9f5c872ed1 ci: Exclude spuriously failing test from JOM nightly CI job Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6797
| * | ci: Exclude spuriously failing test from JOM nightly CI jobBrad King2021-12-091-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 3b9975d9b5 (ci: Add JOM nightly CI job, 2021-11-17) the `ExternalProject` test often fails spuriously with an internal error message from JOM. Exclude it for now pending further investigation. Prior to covering JOM in CI, it was covered by a standalone nightly build that excluded the `ExternalProject` test for the same reason.
* | | CMake Nightly Date StampKitware Robot2021-12-101-1/+1
|/ /
* | Merge topic 'tests_if_version'Brad King2021-12-091-2/+78
|\ \ | | | | | | | | | | | | | | | | | | | | | 1a813273ca Tests: Add more version comparison tests Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6791
| * | Tests: Add more version comparison testsPaweł Bylica2021-12-081-2/+78
| | |
* | | Merge topic 'ctest-add_subdirectory'Brad King2021-12-093-55/+78
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7c5a120c38 Tests: Add case covering both ctest subdirectory commands 04deda1d2a CTest: Extract common implementation of add_subdirectory and subdirs Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6795
| * | | Tests: Add case covering both ctest subdirectory commandsBrad King2021-12-082-0/+40
| | | | | | | | | | | | | | | | | | | | CTest re-implements the `subdirs` and `add_subdirectory` commands. Verify that they both work.
| * | | CTest: Extract common implementation of add_subdirectory and subdirsfriendlyanon2021-12-081-55/+38
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | The two functions have basically the same functionality in a CTest context, however the add_subdirectory implementation was missing code for changing the current working directory similarly to how it was done for subdirs. This commit extracts the common code and also fixes that bug. Issue: #22921
* | | Merge topic 'simplify-backtrace'Brad King2021-12-0921-229/+175
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 61c46c95ae cmListFileContext: Simplify explicit rule-of-five members d0ceb409ff cmListFileBacktrace: Remove unused "Depth" method 7b677dbb92 cmListFileBacktrace: Remove unused "bottom" entry 56dc22d488 cmMessenger: Make relative path conversion more explicit c749982c13 cmTargetPropertyComputer: Simplify by restoring use of cmMakefile 3d378541bb cmMessenger: Adopt backtrace printing functions Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6794
| * | | cmListFileContext: Simplify explicit rule-of-five membersBrad King2021-12-081-8/+12
| | | |
| * | | cmListFileBacktrace: Remove unused "Depth" methodBrad King2021-12-082-15/+0
| | | |
| * | | cmListFileBacktrace: Remove unused "bottom" entryBrad King2021-12-084-60/+6
| | | | | | | | | | | | | | | | | | | | All uses of `GetBottom` by clients have been removed, so drop the method and its supporting infrastructure.
| * | | cmMessenger: Make relative path conversion more explicitBrad King2021-12-083-12/+26
| | | | | | | | | | | | | | | | | | | | Move the decision to convert to call stacks to relative paths out to the client. Avoid using `cmState` to make the decision ourselves.
| * | | cmTargetPropertyComputer: Simplify by restoring use of cmMakefileBrad King2021-12-089-60/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logically revert commit 390a7d8647 (cmTargetPropertyComputer: Implement GetProperty without cmMakefile, 2016-10-13, v3.8.0-rc1~445^2~9). It relied on using `cmListFileBacktrace` to get a scope in which to look up policies. This does remove a backtrace from `LOCATION` property errors at generate time, but the backtrace we reported before was incorrect. It pointed at the addition of a target, not to the reference to the property.
| * | | cmMessenger: Adopt backtrace printing functionsBrad King2021-12-0810-87/+107
| |/ / | | | | | | | | | | | | | | | Move backtrace printing functions from `cmListFileBacktrace` over to `cmMessenger`, their primary caller. Thread `cmMessenger` instances through APIs needed to update other call sites.
* | | CMake Nightly Date StampKitware Robot2021-12-091-1/+1
| | |
* | | Merge topic 'doc-function-naming'Brad King2021-12-081-4/+57
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | 74f1fbb7a1 Help/dev: Cover module function naming in CMake Documentation Guide Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Craig Scott <craig.scott@crascit.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6793
| * | Help/dev: Cover module function naming in CMake Documentation GuideBrad King2021-12-081-4/+57
| | |
* | | Merge branch 'release-3.22'Brad King2021-12-080-0/+0
|\ \ \
| * \ \ Merge topic 'python3.11-support' into release-3.22Brad King2021-12-083-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 43844c5d82 FindPython: Add support for Python 3.11 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Marc Chevrier <marc.chevrier@gmail.com> Merge-request: !6792
* | \ \ \ Merge topic 'python3.11-support'Brad King2021-12-083-3/+3
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 43844c5d82 FindPython: Add support for Python 3.11 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Marc Chevrier <marc.chevrier@gmail.com> Merge-request: !6792
| * | | | FindPython: Add support for Python 3.11Tomáš Hrnčiar2021-12-073-3/+3
| |/ / /
* | | | CMake Nightly Date StampKitware Robot2021-12-081-1/+1
| |/ / |/| |
* | | Merge branch 'release-3.22'Brad King2021-12-070-0/+0
|\ \ \ | |/ /
| * | CMake 3.22.1v3.22.1Brad King2021-12-071-1/+1
| | |
* | | Merge branch 'release-3.22'Brad King2021-12-070-0/+0
|\ \ \ | |/ /
| * | Merge topic 'rel-macos-sign-notarize' into release-3.22Brad King2021-12-071-0/+118
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | bed4b1583e Utilities/Release: Add script to sign/notarize macOS application bundle Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6784
* | \ \ Merge topic 'rel-macos-sign-notarize'Brad King2021-12-071-0/+117
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2247a7929d Utilities/Release: Update macOS signing script for CPack OSXX11 removal bc01eda290 Merge branch 'backport-3.22-rel-macos-sign-notarize' into rel-macos-sign-notarize bed4b1583e Utilities/Release: Add script to sign/notarize macOS application bundle Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6784
| * | | | Utilities/Release: Update macOS signing script for CPack OSXX11 removalBrad King2021-12-061-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 4ef974e6cb (CPack: Remove undocumented deprecated OSXX11 generator, 2021-11-05), the `CPack.OSXScriptLauncher.in` binary is no longer installed in the `CMake.app` bundle, so it does not need to be signed.
| * | | | Merge branch 'backport-3.22-rel-macos-sign-notarize' into ↵Brad King2021-12-061-0/+118
| |\ \ \ \ | | | |/ / | | |/| | | | | | | rel-macos-sign-notarize
| | * | | Utilities/Release: Add script to sign/notarize macOS application bundleBrad King2021-12-061-0/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We produce macOS binaries for `cmake.org` using GitLab CI jobs. Binaries for official releases are additionally signed and notarized manually by a maintainer with suitable signing certificates and Apple developer account credentials. Add a script to drive these steps.
* | | | | Merge branch 'release-3.22'Brad King2021-12-070-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge topic 'makefile-CMAKE_EXPORT_COMPILE_COMMANDS-HIP' into release-3.22Brad King2021-12-071-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b59f7600c4 HIP: Enable CMAKE_EXPORT_COMPILE_COMMANDS for HIP Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6789
* | \ \ \ \ Merge topic 'makefile-CMAKE_EXPORT_COMPILE_COMMANDS-HIP'Brad King2021-12-071-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | b59f7600c4 HIP: Enable CMAKE_EXPORT_COMPILE_COMMANDS for HIP Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6789
| * | | | | HIP: Enable CMAKE_EXPORT_COMPILE_COMMANDS for HIPBrad King2021-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #22986
* | | | | | Merge branch 'release-3.22'Brad King2021-12-070-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'lib-arch-no-usr' into release-3.22Brad King2021-12-079-1/+125
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | d4ba945c48 CMakeParseLibraryArchitecture: Fix parsing /lib/<arch> implicit object path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6790
* | | | | | Merge topic 'lib-arch-no-usr'Brad King2021-12-079-1/+125
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | d4ba945c48 CMakeParseLibraryArchitecture: Fix parsing /lib/<arch> implicit object path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6790
| * | | | | CMakeParseLibraryArchitecture: Fix parsing /lib/<arch> implicit object pathRaphael Gozzo2021-12-069-1/+125
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current regular expression is able to match `/usr/lib/<arch>`, `/usr/usr/lib/<arch>`, `/usr/usr/usr/lib/<arch>`, ... but not `/lib/<arch>`. This behavior ends up causing the detected architecture to be x86_64-pc-linux-gnu when the Clang compiler is installed on a "non-system" location (like /opt/llvm-13) which, in turn, makes almost every 'find_library()' fail because the correct architecture is x86_64-linux-gnu. This is due to a typo in commit 764606e256 (CMakeDetermineCompilerABI: Extract lib arch from implicit object file paths, 2021-04-05, v3.20.1~10^2), which used `+` instead of `?`.
* | | | | Merge topic 'FindOpenSSL-applink'Brad King2021-12-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 586d483983 FindOpenSSL: Fix typo in applink condition Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6787
| * | | | | FindOpenSSL: Fix typo in applink conditionBrad King2021-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 7b83ca816a (FindOpenSSL: add target OpenSSL::applink to support OpenSSL's applink feature, 2020-05-12, v3.18.0-rc1~150^2) the version check was written as "major.major.fix" instead of "major.minor.fix".
* | | | | | Merge topic 'FindOpenSSL-lib64'Brad King2021-12-071-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae48449cf0 FindOpenSSL: Search in lib64 directories on non-Windows platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6788
| * | | | | FindOpenSSL: Search in lib64 directories on non-Windows platformsBrad King2021-12-061-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The upstream `openssl` build system may install libraries to `lib64` even on platforms whose conventions do not use `lib64` for distro-packaged libraries. Fixes: #22945
* | | | | CMake Nightly Date StampKitware Robot2021-12-071-1/+1
| | | | |
* | | | | Merge topic 'vs-debugger-settings'Brad King2021-12-061-34/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19e37116cb VS: Move LocalDebugger* settings to the end of their PropertyGroup Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6783
| * | | | | VS: Move LocalDebugger* settings to the end of their PropertyGroupCedric Martineau2021-12-031-34/+34
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Define the settings after others like `OutDir` so that the latter can be referenced. Fixes: #18094
* | | | | Merge branch 'release-3.22'Brad King2021-12-060-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge topic 'ci-vs-managed' into release-3.22Brad King2021-12-061-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 69419c5870 ci: Enable more VS tests that use managed code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6782