mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-17 12:40:40 -06:00
Code Issues Packages Projects Releases Wiki Activity
55,553 Commits 2 Branches 390 Tags
290ff01849175fcfcccd5305b0d2f336b62abe53
Commit Graph

55553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
290ff01849 Merge branch 'release-3.22' 2021-12-06 15:16:01 -05:00
Brad King
b3f1f568d3 Merge topic 'ci-vs-managed' 
69419c5870 ci: Enable more VS tests that use managed code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6782
 2021-12-06 15:16:00 -05:00
Brad King
60ebe5f3da Merge topic 'ci-vs-managed' into release-3.22 
69419c5870 ci: Enable more VS tests that use managed code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6782
 2021-12-06 15:15:59 -05:00
Kitware Robot
14f8990a60 CMake Nightly Date Stamp 2021-12-06 00:03:24 -05:00
Kitware Robot
a54f18ff36 CMake Nightly Date Stamp 2021-12-05 00:02:10 -05:00
Kitware Robot
b00cb8f405 CMake Nightly Date Stamp 2021-12-04 00:02:33 -05:00
Brad King
69419c5870 ci: Enable more VS tests that use managed code 
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.
 2021-12-03 09:09:04 -05:00
Brad King
949227b5d4 Merge branch 'release-3.22' 2021-12-03 08:54:34 -05:00
Brad King
9ecb24b5a7 Merge topic 'vs-csproj-scripts' 
13a7ae2194 VS: Revert "Add missing label in C# project-build events"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6781
 2021-12-03 08:54:34 -05:00
Brad King
67cbfed819 Merge topic 'vs-csproj-scripts' into release-3.22 
13a7ae2194 VS: Revert "Add missing label in C# project-build events"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6781
 2021-12-03 08:54:33 -05:00
Brad King
cf32ffda05 Merge branch 'release-3.22' 2021-12-03 08:53:26 -05:00
Brad King
6627cc23b4 Merge topic 'FindPkgConfig-pkgconf' 
90a49647e9 FindPkgConfig: Restore finding pkg-config before pkgconf

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6780
 2021-12-03 08:53:26 -05:00
Brad King
d565f9f0ee Merge topic 'FindPkgConfig-pkgconf' into release-3.22 
90a49647e9 FindPkgConfig: Restore finding pkg-config before pkgconf

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6780
 2021-12-03 08:53:25 -05:00
Kitware Robot
824a6836be CMake Nightly Date Stamp 2021-12-03 00:02:10 -05:00
Brad King
13a7ae2194 VS: Revert "Add missing label in C# project-build events" 
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
 2021-12-02 18:06:39 -05:00
Brad King
90a49647e9 FindPkgConfig: Restore finding pkg-config before pkgconf 
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
 2021-12-02 12:38:22 -05:00
Brad King
2d4c3cf684 Merge topic 'ifw-sign-installer' 
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
 2021-12-02 12:32:01 -05:00
Brad King
304e5e3584 Merge topic 'cleanup-ConvertToIncludeReference' 
94a58e502b cmLocalGenerator: Remove unused IncludePathStyle infrastructure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6777
 2021-12-02 11:50:39 -05:00
Brad King
ec8e7ead28 Merge topic 'semi-warnings' 
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
 2021-12-02 11:49:52 -05:00
Brad King
b2ad2ab37b Merge branch 'release-3.22' 2021-12-02 11:48:39 -05:00
Brad King
3bb6e0dd00 Merge topic 'FindPython-static-libs-hint' 
a35bf772de FindPython: clarify static libraries hint usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6772
 2021-12-02 11:48:39 -05:00
Brad King
eeaf1e10cb Merge topic 'FindPython-static-libs-hint' into release-3.22 
a35bf772de FindPython: clarify static libraries hint usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6772
 2021-12-02 11:48:38 -05:00
Brad King
9027545354 Merge topic 'vs-enum-class' 
a80d95b114 cmVisualStudio10TargetGenerator: Change VsProjectType to be enum class

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6776
 2021-12-02 11:47:31 -05:00
Brad King
c9e776bcb4 Merge branch 'release-3.22' 2021-12-02 11:45:38 -05:00
Brad King
57349a4851 Merge topic 'rpath-unrecognized-format' 
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
 2021-12-02 11:45:38 -05:00
Brad King
3883b11edb Merge topic 'rpath-unrecognized-format' into release-3.22 
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
 2021-12-02 11:45:37 -05:00
Kitware Robot
ec55e0abc1 CMake Nightly Date Stamp 2021-12-02 00:02:17 -05:00
Brad King
643fc46bdc file(RPATH): Restore tolerance of unknown formats if new RPATH is empty 
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
 2021-12-01 12:58:11 -05:00
Brad King
5596cba7dc cmSystemTools: Remove unnecessary mark-as-used casts to void 
The `CheckRPath` arguments are always used now.
 2021-12-01 12:40:03 -05:00
Brad King
94a58e502b cmLocalGenerator: Remove unused IncludePathStyle infrastructure 
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.
 2021-12-01 11:33:30 -05:00
Sean McBride
4b548c1028 Source: Fix -Wmissing-variable-declarations warning 2021-12-01 11:17:39 -05:00
Sean McBride
29ffa5f48c Source: fix -Wextra-semi-stmt warnings 2021-12-01 11:17:39 -05:00
Marc Chevrier
a35bf772de FindPython: clarify static libraries hint usage 
Fixes: #22956
 2021-12-01 10:06:45 -05:00
Sumit Bhardwaj
a80d95b114 cmVisualStudio10TargetGenerator: Change VsProjectType to be enum class 2021-12-01 09:51:26 -05:00
Brad King
29c80aec94 Merge topic 'tutorial-cpack-source-archive' 
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
 2021-12-01 09:47:57 -05:00
Brad King
e73de3b9cc Merge topic 'tutorial-install-arg-order' 
4f524797dc Tutorial: Order install(TARGETS) EXPORT option consistently with docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6770
 2021-12-01 09:47:08 -05:00
Brad King
dbf0c8c233 Merge topic 'GNUInstallDirs-freebsd-mandir' 
c07bba2730 GNUInstallDirs: Update CMAKE_INSTALL_MANDIR for FreeBSD

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6722
 2021-12-01 09:42:13 -05:00
Brad King
faaf82175c Merge topic 'deps-quiet-rc' 
1336a76380 cmcldeps: Suppress rc dummy output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6771
 2021-12-01 09:41:13 -05:00
Brad King
40bb1b566b Merge branch 'release-3.22' 2021-12-01 09:37:41 -05:00
Brad King
1c77801636 Merge topic 'doc-if-basic-expressions' 
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
 2021-12-01 09:37:41 -05:00
Brad King
55c4f54e48 Merge topic 'doc-if-basic-expressions' into release-3.22 
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
 2021-12-01 09:37:40 -05:00
Brad King
1e0b4b5f39 Merge branch 'release-3.22' 2021-12-01 09:34:33 -05:00
Brad King
6f05012126 Merge topic 'GNUInstallDirs-conda-fix' 
7896991af0 GNUInstallDirs: Prefer system lib64 over conda lib when ambiguous

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6773
 2021-12-01 09:34:33 -05:00
Brad King
cab4551889 Merge topic 'GNUInstallDirs-conda-fix' into release-3.22 
7896991af0 GNUInstallDirs: Prefer system lib64 over conda lib when ambiguous

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6773
 2021-12-01 09:34:32 -05:00
Brad King
faaaf64225 Merge branch 'release-3.22' 2021-12-01 09:33:23 -05:00
Brad King
9c3b97eb32 Merge topic 'mingw-strftime-crash' 
992e6d7c5d mingw: fix calling convention for strftime()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6762
 2021-12-01 09:33:23 -05:00
Brad King
bd7f276c52 Merge topic 'mingw-strftime-crash' into release-3.22 
992e6d7c5d mingw: fix calling convention for strftime()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6762
 2021-12-01 09:33:22 -05:00
Craig Scott
294581a443 Help: Be more explicit about the behavior of if(<string>) 2021-12-01 18:59:23 +11:00
Craig Scott
3a9695557d Help: Explicitly state that if(ENV{some_var}) is always false 2021-12-01 18:30:26 +11:00
Kitware Robot
2097f9a3a4 CMake Nightly Date Stamp 2021-12-01 00:02:16 -05:00