mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-18 21:20:40 -06:00
Code Issues Packages Projects Releases Wiki Activity
55,530 Commits 2 Branches 390 Tags
b2ad2ab37bf4453b364293eeaeafbd4f091937eb
Commit Graph

55530 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Joachim Wuttke (h)
39c410624a Tutorial: in step 7, disambiguate installed/source archive 2021-11-30 12:32:12 -05:00
Joachim Wuttke (h)
44c527bc63 Tutorial: Package only one source archive 2021-11-30 12:31:55 -05:00
Joachim Wuttke (h)
4f524797dc Tutorial: Order install(TARGETS) EXPORT option consistently with docs 2021-11-30 12:23:56 -05:00
Dmitry Marakasov
c07bba2730 GNUInstallDirs: Update CMAKE_INSTALL_MANDIR for FreeBSD 
FreeBSD has switched from PREFIX/man ro PREFIX/share/man
see https://cgit.freebsd.org/ports/tree/CHANGES entry 20200115.

Fixes: #22883
 2021-11-30 12:16:37 -05:00
Christoph Reiter
992e6d7c5d mingw: fix calling convention for strftime() 
`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
 2021-11-30 11:03:33 -05:00
Robert Maynard
7896991af0 GNUInstallDirs: Prefer system lib64 over conda lib when ambiguous 
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
 2021-11-30 10:51:33 -05:00
Brad King
63b91058d7 Merge branch 'release-3.22' 2021-11-30 08:46:12 -05:00
Brad King
c8f039b77f Merge topic 'doc-CMAKE_INSTALL_MODE' 
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
 2021-11-30 08:46:12 -05:00
Brad King
5109a22d61 Merge topic 'doc-CMAKE_INSTALL_MODE' into release-3.22 
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
 2021-11-30 08:46:11 -05:00
Kitware Robot
8af730d87d CMake Nightly Date Stamp 2021-11-30 00:01:09 -05:00
Brad King
065604b2b3 Merge branch 'release-3.22' 2021-11-29 12:27:37 -05:00
Brad King
b7c679f03a Merge topic 'compiler-id-classic-c' 
0fc8b2f61c CompilerId: Restore support for classic C by avoiding C++ style comments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6759
 2021-11-29 12:27:37 -05:00
Brad King
ee2a3254ee Merge topic 'compiler-id-classic-c' into release-3.22 
0fc8b2f61c CompilerId: Restore support for classic C by avoiding C++ style comments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6759
 2021-11-29 12:27:36 -05:00
Orgad Shaneh
1336a76380 cmcldeps: Suppress rc dummy output 
Microsoft (R) Windows (R) Resource Compiler Version 10.0.10011.16384
Copyright (C) Microsoft Corporation.  All rights reserved.
 2021-11-29 09:46:36 +02:00
Kitware Robot
f9a657ee5d CMake Nightly Date Stamp 2021-11-29 00:01:25 -05:00
Kitware Robot
dea324f804 CMake Nightly Date Stamp 2021-11-28 00:02:26 -05:00
Kitware Robot
56e6f68d5a CMake Nightly Date Stamp 2021-11-27 00:02:10 -05:00
Kitware Robot
9b6ad5d528 CMake Nightly Date Stamp 2021-11-26 00:01:07 -05:00
Kitware Robot
12d4372b58 CMake Nightly Date Stamp 2021-11-25 00:02:07 -05:00
Kitware Robot
dfc8eb90eb CMake Nightly Date Stamp 2021-11-24 00:01:45 -05:00
Felix Lelchuk
3caeee0c86 Help: Clarify CMAKE_INSTALL_MODE documentation 
Fixes: #22869
Co-Authored-By: Craig Scott <craig.scott@crascit.com>
 2021-11-24 08:30:38 +11:00
Craig Scott
699d4a98e2 Help: Use definition list for allowed values of CMAKE_INSTALL_MODE 
Clean up the wording as well for improved consistency
and clarity.
 2021-11-24 08:20:04 +11:00