summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | 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
* | | | | | | Merge topic 'ci-vs-managed'Brad 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
| * | | | | ci: Enable more VS tests that use managed codeBrad King2021-12-031-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A couple of VS tests were conditioned on `NOT CMAKE_GENERATOR_TOOLSET`, but in CI jobs with VS we always set `CMAKE_GENERATOR_TOOLSET`. Make the condition specific to excluding the `v90` toolset, which was its original intention anyway.
* | | | | CMake Nightly Date StampKitware Robot2021-12-061-1/+1
| |_|_|/ |/| | |
* | | | CMake Nightly Date StampKitware Robot2021-12-051-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2021-12-041-1/+1
| |/ / |/| |
* | | Merge branch 'release-3.22'Brad King2021-12-030-0/+0
|\ \ \ | |/ /
| * | Merge topic 'vs-csproj-scripts' into release-3.22Brad King2021-12-037-26/+25
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 13a7ae2194 VS: Revert "Add missing label in C# project-build events" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6781
* | \ \ Merge topic 'vs-csproj-scripts'Brad King2021-12-037-26/+25
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 13a7ae2194 VS: Revert "Add missing label in C# project-build events" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6781
| * | | VS: Revert "Add missing label in C# project-build events"Brad King2021-12-027-26/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit b284a21fee (VS: Add missing label in C# project-build events, 2021-09-03, v3.22.0-rc1~156^2). The change broke cases using multiple successful custom commands. Revert it pending further investigation into the interaction of the generated script code with `Microsoft.Common.CurrentVersion.targets`, and whether this is needed for all managed projects or just C# projects. Also add a test covering the case that was broken. Fixes: #22964 Issue: #21440
* | | | Merge branch 'release-3.22'Brad King2021-12-030-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'FindPkgConfig-pkgconf' into release-3.22Brad King2021-12-031-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 90a49647e9 FindPkgConfig: Restore finding pkg-config before pkgconf Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6780
* | | | Merge topic 'FindPkgConfig-pkgconf'Brad King2021-12-031-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 90a49647e9 FindPkgConfig: Restore finding pkg-config before pkgconf Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6780
| * | | FindPkgConfig: Restore finding pkg-config before pkgconfBrad King2021-12-021-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 94a84dc0af (FindPkgConfig: add pkgconf to the search list., 2021-07-02, v3.22.0-rc1~468^2), `pkgconf` is preferred over `pkg-config` if they appear in the same directory. In some environments, `pkg-config` may be a wrapper that adds semantics beyond either `pkgconf` or the normal `pkg-config`. Prefer `pkg-config` over `pkgconf` in order to preserve the prior behavior in such environments. Fixes: #22976
* | | CMake Nightly Date StampKitware Robot2021-12-031-1/+1
| | |
* | | Merge topic 'ifw-sign-installer'Brad King2021-12-025-0/+37
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8e07a90c1 CPackIFW: add support for signing the generated app bundles on macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6754
| * | | CPackIFW: add support for signing the generated app bundles on macOSErlend E. Aasland2021-11-225-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the CPACK_IFW_PACKAGE_SIGNING_IDENTITY CPackIFW variable. This variable mirrors the --sign option of the binarycreator tool. Fixes: #22927
* | | | Merge topic 'cleanup-ConvertToIncludeReference'Brad King2021-12-026-39/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 94a58e502b cmLocalGenerator: Remove unused IncludePathStyle infrastructure Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6777
| * | | | cmLocalGenerator: Remove unused IncludePathStyle infrastructureBrad King2021-12-016-39/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is unused since commit c564a3e3ff (Ninja: Always compile sources using absolute paths, 2021-05-19, v3.21.0-rc1~129^2), which left behind a FIXME comment to eventually remove it.
* | | | | Merge topic 'semi-warnings'Brad King2021-12-025-30/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b548c1028 Source: Fix -Wmissing-variable-declarations warning 29ffa5f48c Source: fix -Wextra-semi-stmt warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6758
| * | | | | Source: Fix -Wmissing-variable-declarations warningSean McBride2021-12-012-4/+3
| | | | | |
| * | | | | Source: fix -Wextra-semi-stmt warningsSean McBride2021-12-013-26/+26
| |/ / / /
* | | | | Merge branch 'release-3.22'Brad King2021-12-020-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge topic 'FindPython-static-libs-hint' into release-3.22Brad King2021-12-023-0/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a35bf772de FindPython: clarify static libraries hint usage Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6772
* | \ \ \ \ Merge topic 'FindPython-static-libs-hint'Brad King2021-12-023-0/+15
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | a35bf772de FindPython: clarify static libraries hint usage Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6772
| * | | | | FindPython: clarify static libraries hint usageMarc Chevrier2021-12-013-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #22956
* | | | | | Merge topic 'vs-enum-class'Brad King2021-12-022-53/+58
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a80d95b114 cmVisualStudio10TargetGenerator: Change VsProjectType to be enum class Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6776
| * | | | | | cmVisualStudio10TargetGenerator: Change VsProjectType to be enum classSumit Bhardwaj2021-12-012-53/+58
| | | | | | |
* | | | | | | Merge branch 'release-3.22'Brad King2021-12-020-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge topic 'rpath-unrecognized-format' into release-3.22Brad King2021-12-0213-4/+85
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 643fc46bdc file(RPATH): Restore tolerance of unknown formats if new RPATH is empty 5596cba7dc cmSystemTools: Remove unnecessary mark-as-used casts to void Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6779
* | | | | | | Merge topic 'rpath-unrecognized-format'Brad King2021-12-0213-4/+85
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 643fc46bdc file(RPATH): Restore tolerance of unknown formats if new RPATH is empty 5596cba7dc cmSystemTools: Remove unnecessary mark-as-used casts to void Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6779
| * | | | | | file(RPATH): Restore tolerance of unknown formats if new RPATH is emptyBrad King2021-12-0113-2/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 2e1149874d (cmSystemTools: Support multiple binary formats, 2021-06-14, v3.22.0-rc1~575^2) the `file(RPATH_...)` operations fail on files that are not ELF or XCOFF format. Previously the RPATH operations tolerated files of unknown format if the goal was to produce a file with an empty RPATH. Restore this tolerance in order to support setting an empty RPATH on GNU ld scripts. Fixes: #22963
| * | | | | | cmSystemTools: Remove unnecessary mark-as-used casts to voidBrad King2021-12-011-2/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | The `CheckRPath` arguments are always used now.