summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | | CMake Nightly Date StampKitware Robot2021-12-021-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'tutorial-cpack-source-archive'Brad King2021-12-016-2/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 39c410624a Tutorial: in step 7, disambiguate installed/source archive 44c527bc63 Tutorial: Package only one source archive Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6765
| * | | | Tutorial: in step 7, disambiguate installed/source archiveJoachim Wuttke (h)2021-11-301-1/+5
| | | | |
| * | | | Tutorial: Package only one source archiveJoachim Wuttke (h)2021-11-306-1/+7
| | | | |
* | | | | Merge topic 'tutorial-install-arg-order'Brad King2021-12-012-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4f524797dc Tutorial: Order install(TARGETS) EXPORT option consistently with docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6770
| * | | | | Tutorial: Order install(TARGETS) EXPORT option consistently with docsJoachim Wuttke (h)2021-11-302-4/+4
| | | | | |
* | | | | | Merge topic 'GNUInstallDirs-freebsd-mandir'Brad King2021-12-015-9/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c07bba2730 GNUInstallDirs: Update CMAKE_INSTALL_MANDIR for FreeBSD Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6722
| * | | | | | GNUInstallDirs: Update CMAKE_INSTALL_MANDIR for FreeBSDDmitry Marakasov2021-11-305-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FreeBSD has switched from PREFIX/man ro PREFIX/share/man see https://cgit.freebsd.org/ports/tree/CHANGES entry 20200115. Fixes: #22883
* | | | | | | Merge topic 'deps-quiet-rc'Brad King2021-12-011-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1336a76380 cmcldeps: Suppress rc dummy output Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6771
| * | | | | | | cmcldeps: Suppress rc dummy outputOrgad Shaneh2021-11-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Microsoft (R) Windows (R) Resource Compiler Version 10.0.10011.16384 Copyright (C) Microsoft Corporation. All rights reserved.
* | | | | | | | Merge branch 'release-3.22'Brad King2021-12-010-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge topic 'doc-if-basic-expressions' into release-3.22Brad King2021-12-011-4/+15
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 294581a443 Help: Be more explicit about the behavior of if(<string>) 3a9695557d Help: Explicitly state that if(ENV{some_var}) is always false Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6768
* | \ \ \ \ \ \ \ Merge topic 'doc-if-basic-expressions'Brad King2021-12-011-4/+15
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 294581a443 Help: Be more explicit about the behavior of if(<string>) 3a9695557d Help: Explicitly state that if(ENV{some_var}) is always false Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6768
| * | | | | | | | Help: Be more explicit about the behavior of if(<string>)Craig Scott2021-12-011-4/+13
| | | | | | | | |
| * | | | | | | | Help: Explicitly state that if(ENV{some_var}) is always falseCraig Scott2021-12-011-1/+3
| | | | | | | | |
* | | | | | | | | Merge branch 'release-3.22'Brad King2021-12-010-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'GNUInstallDirs-conda-fix' into release-3.22Brad King2021-12-011-1/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7896991af0 GNUInstallDirs: Prefer system lib64 over conda lib when ambiguous Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6773
* | \ \ \ \ \ \ \ \ Merge topic 'GNUInstallDirs-conda-fix'Brad King2021-12-011-1/+3
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7896991af0 GNUInstallDirs: Prefer system lib64 over conda lib when ambiguous Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6773
| * | | | | | | | | GNUInstallDirs: Prefer system lib64 over conda lib when ambiguousRobert Maynard2021-11-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update logic added by commit ecaca8c129 (GNUInstallDirs now aware of conda lib directory requirements, 2021-09-08, v3.22.0-rc1~142^2). When it is ambiguous if we are doing a conda install or a system install prefer using the system library directory. Fixes: #22962
* | | | | | | | | | Merge branch 'release-3.22'Brad King2021-12-010-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'mingw-strftime-crash' into release-3.22Brad King2021-12-011-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 992e6d7c5d mingw: fix calling convention for strftime() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6762
* | \ \ \ \ \ \ \ \ \ Merge topic 'mingw-strftime-crash'Brad King2021-12-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | / / | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 992e6d7c5d mingw: fix calling convention for strftime() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6762
| * | | | | | | | | mingw: fix calling convention for strftime()Christoph Reiter2021-11-301-1/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `strftime` uses `__cdecl` and not `__stdcall`. This was exposed by refactoring in commit 26c9fbab46 (MINGW-w64: Fix string(TIMESTAMP) build on 32bits, 2021-11-16, v3.22.0~1^2). This fixes a crash creating a timestamp with clang+mingw-w64 targeting x86. Fixes: #22939
* | | | | | | | | CMake Nightly Date StampKitware Robot2021-12-011-1/+1
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge branch 'release-3.22'Brad King2021-11-300-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge topic 'doc-CMAKE_INSTALL_MODE' into release-3.22Brad King2021-11-302-16/+111
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3caeee0c86 Help: Clarify CMAKE_INSTALL_MODE documentation 699d4a98e2 Help: Use definition list for allowed values of CMAKE_INSTALL_MODE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6743
* | \ \ \ \ \ \ \ Merge topic 'doc-CMAKE_INSTALL_MODE'Brad King2021-11-302-16/+111
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3caeee0c86 Help: Clarify CMAKE_INSTALL_MODE documentation 699d4a98e2 Help: Use definition list for allowed values of CMAKE_INSTALL_MODE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6743
generated by cgit v0.12 at 2025-09-07 18:16:34 (GMT)