mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-07 23:28:36 -06:00
Code Issues Packages Projects Releases Wiki Activity
58,169 Commits 2 Branches 392 Tags
d21b391cdec4d6d8ac5baa80a584aa3442ea5239
Commit Graph

58169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
d21b391cde Merge topic 'file-TIMESTAMP-relative-path' 
733801b57f file(TIMESTAMP): Interpret relative paths w.r.t. the source tree

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7440
 2022-07-07 09:22:11 -04:00
Brad King
3b1d54506f Merge topic 'generator-makefiles-deps-messages-VERBOSE' 
9480ced81a Makefiles generator: dependencies messages in verbose mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7456
 2022-07-07 09:14:23 -04:00
Brad King
394434df19 Merge branch 'release-3.24' 2022-07-07 09:13:14 -04:00
Brad King
e5530f3d97 Merge topic 'ccmake-fix-pdcurses-windows' 
a78d10220c ccmake: Fix mangled configuration log with PDCurses on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7458
 2022-07-07 09:13:13 -04:00
Brad King
18a3ee6885 Merge topic 'ccmake-fix-pdcurses-windows' into release-3.24 
a78d10220c ccmake: Fix mangled configuration log with PDCurses on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7458
 2022-07-07 09:13:12 -04:00
Brad King
d3638a67fc Merge branch 'release-3.24' 2022-07-07 09:07:01 -04:00
Brad King
24631689f0 Merge topic 'genex-LINK_LIBRARY-check-supported-properties' 
913ea78d7a Genex LINK_LIBRARY and LINK_GROUP: check supported properties

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7454
 2022-07-07 09:07:01 -04:00
Brad King
5970536e16 Merge topic 'genex-LINK_LIBRARY-check-supported-properties' into release-3.24 
913ea78d7a Genex LINK_LIBRARY and LINK_GROUP: check supported properties

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7454
 2022-07-07 09:07:00 -04:00
Brad King
53d89b30d8 Merge branch 'release-3.24' 2022-07-07 09:05:39 -04:00
Brad King
d213cf1193 Merge topic 'findwxwidgets-mingw-regression' 
7d6e01801d FindwxWidgets: Do not reset wxWidgets_LIB_DIR unnecessarily
6dce42b171 FindwxWidgets: Restore win32 find style on MinGW

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7451
 2022-07-07 09:05:39 -04:00
Brad King
f92964bf49 Merge topic 'findwxwidgets-mingw-regression' into release-3.24 
7d6e01801d FindwxWidgets: Do not reset wxWidgets_LIB_DIR unnecessarily
6dce42b171 FindwxWidgets: Restore win32 find style on MinGW

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7451
 2022-07-07 09:05:38 -04:00
Brad King
47f6fc85a3 Merge branch 'release-3.24' 2022-07-07 09:03:59 -04:00
Brad King
6635e228ba Merge branch 'release-3.23' 2022-07-07 09:03:57 -04:00
Brad King
702f711584 Merge branch 'release-3.22' 2022-07-07 09:03:55 -04:00
Brad King
78ab4f9b97 Merge branch 'release-3.23' into release-3.24 2022-07-07 09:03:48 -04:00
Brad King
8b89649253 Merge branch 'release-3.22' into release-3.23 2022-07-07 09:03:38 -04:00
Brad King
7a55be9f04 Merge branch 'release-3.24' 2022-07-07 09:02:02 -04:00
Brad King
a502c11a44 Merge topic 'FindLAPACK-nvhpc' 
28d52a43fc FindLAPACK: Add '-fortranlibs' flag only with NVHPC/PGI compilers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7452
 2022-07-07 09:02:02 -04:00
Brad King
acc6a08641 Merge topic 'FindLAPACK-nvhpc' into release-3.24 
28d52a43fc FindLAPACK: Add '-fortranlibs' flag only with NVHPC/PGI compilers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7452
 2022-07-07 09:02:01 -04:00
Brad King
05a5d351f4 Merge branch 'FindLAPACK-nvhpc' into release-3.23 
Merge-request: !7452
 2022-07-07 09:01:20 -04:00
Brad King
7cc61ff9e8 Merge branch 'FindLAPACK-nvhpc' into release-3.22 
Merge-request: !7452
 2022-07-07 09:00:30 -04:00
Kitware Robot
f0bb74765a CMake Nightly Date Stamp 2022-07-07 00:01:08 -04:00
Eisuke Kawashima
28d52a43fc FindLAPACK: Add '-fortranlibs' flag only with NVHPC/PGI compilers 
Since commit 2c9e623e31 (Find{BLAS,LAPACK}: Add support for the NVHPC
LAPACK library, 2021-05-05, v3.21.0-rc1~192^2) we try the `-fortranlibs`
option as a dependency of the NVHPC LAPACK.  That flag is specific to
the NVHPC/PGI compilers, so use it conditionally with them.

Without this modification, CMake fails to find LAPACK if

- compiler ID is GNU
- `BLA_STATIC` is `ON`
- `BLA_VENDOR` is not defined or set to `All`

Fixes: #23705, #22878
 2022-07-06 13:58:47 -04:00
Duncan Ogilvie
a78d10220c ccmake: Fix mangled configuration log with PDCurses on Windows 
This fix seems to work on both Windows and Ubuntu (WSL).

Issue: #18053
 2022-07-06 12:14:47 -04:00
Marc Chevrier
9480ced81a Makefiles generator: dependencies messages in verbose mode 
Fixes: #23689
 2022-07-06 17:40:08 +02:00
Marc Chevrier
913ea78d7a Genex LINK_LIBRARY and LINK_GROUP: check supported properties 
Refines check for properties supporting these genex.
Enhance error message.

Fixes: #23699
 2022-07-06 16:15:43 +02:00
Maarten Bent
7d6e01801d FindwxWidgets: Do not reset wxWidgets_LIB_DIR unnecessarily 
Only reset it when `WX_ROOT_DIR` had a value.  This change allows to set
both `wxWidgets_LIB_DIR` and `wxWidgets_ROOT_DIR` at the same time when
they where previously `-NOTFOUND`.
 2022-07-06 09:59:38 -04:00
Maarten Bent
6dce42b171 FindwxWidgets: Restore win32 find style on MinGW 
Since commit 6fac8af9ca (FindwxWidgets: set wxWidgets_FIND_STYLE to unix
on MINGW, 2022-04-11, v3.24.0-rc1~296^2), we only tried unix find style
on MinGW.  However, only some MinGW builds have the `wx-config` needed
for unix find style.  Other builds, including those using the official
wxWidgets makefiles, do not provide `wx-config` and need to use win32
find style.  To accommodate both use cases, first use win32 find style
and if it fails, use unix find style.
 2022-07-06 09:58:48 -04:00
TheBrokenRail
733801b57f file(TIMESTAMP): Interpret relative paths w.r.t. the source tree 
Fixes: #23610
 2022-07-06 09:28:21 -04:00
Brad King
ad2e7f3c53 Merge topic 'command-arg-parser-optional' 
bff468c988 cmFileCommand: Use cm::optional for keyword argument presence
2586afa31b cmCTest*Command:: Use cm::optional for keyword argument presence
5446b15c5c cmInstallCommand: Use cm::optional for keyword argument presence
298f226cb4 cmExportCommand: Use cm::optional for keyword argument presence
0a4c5164c9 cmArgumentParser: Offer cm::optional bindings to capture keyword presence
f3dbf4b89d cmArgumentParser: Remove unnecessary local names for common types
2873f41bd9 cmArgumentParser: Require callers to consider unparsed arguments
1ee5a4a548 cmArgumentParser: Avoid allocating copies of keyword strings
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7450
 2022-07-06 09:22:38 -04:00
Brad King
fd0042b68a Merge topic 'freebsd-cpack-update' 
2655605261 FreeBSD: follow CPACK_PACKAGE_FILE_NAME, if set
50580af645 FreeBSD (docs): repair errors in documentation of FreeBSD-cpack
1b61cd1597 FreeBSD: explain the pkg_create() call
57e8cd1a81 FreeBSD: drop support for libpkg before 1.17

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7447
 2022-07-06 09:19:45 -04:00
Brad King
1d3eb4aa34 Merge topic 'clang-assembler-fix' 
01d05985fd Tests: Pass -fno-lto to the Assembler test when using clang

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7432
 2022-07-06 09:18:46 -04:00
Brad King
4ae8018ddf Merge topic 'FindOpenSSL-doc-pkg-config' 
42199256af FindOpenSSL: Document use of pkg-config
475880f39b FindOpenSSL: Reformat hints documentation as definition list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7441
 2022-07-06 09:17:42 -04:00
Brad King
b80ccea686 Merge topic 'enable_language-deduplicate' 
e3c8012ccd Help: Document enable_language accepting multiple languages
b4fd385c9b cmMakefile: Dedupe languages when enabling them
66bfe14309 cmMakefile: Refactor parameter and variable names for EnableLanguage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7426
 2022-07-06 09:16:34 -04:00
Brad King
2f561f0e24 Merge branch 'release-3.24' 2022-07-06 09:13:06 -04:00
Brad King
18824a9a2d Merge topic 'genex-LINK_LIBRARY-fix-generation' 
e8792da04b genex-LINK_LIBRARY: ensure correct generation inside LINK_GROUP genex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7443
 2022-07-06 09:13:06 -04:00
Brad King
9b051f557e Merge topic 'genex-LINK_LIBRARY-fix-generation' into release-3.24 
e8792da04b genex-LINK_LIBRARY: ensure correct generation inside LINK_GROUP genex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7443
 2022-07-06 09:13:05 -04:00
Brad King
cf6225af3d Merge topic 'vs-test-arm64' 
190e3b93cd Tests: Exclude win/arm64 tests with CMAKE_VS_PLATFORM_NAME

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7449
 2022-07-06 08:55:09 -04:00
Brad King
0b05adebcc Merge topic 'lcc-additional-implicit-link-dirs' 
0eea1e8563 LCC: for OpenMP, collectly determine implicit link dirs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7436
 2022-07-06 08:53:47 -04:00
Brad King
db256a5154 Merge topic 'pkgconfig-when-spaces-in-path' 
bcdac84961 Tests/FindPkgConfig: correctly handle broken pkg-config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7435
 2022-07-06 08:51:58 -04:00
Kitware Robot
d7ba536841 CMake Nightly Date Stamp 2022-07-06 00:01:09 -04:00
Brad King
fc30196e76 Merge branch 'release-3.24' 2022-07-05 17:35:06 -04:00
Brad King
016bc9715c Merge topic 'FindwxWidgets-more-versions' 
2a19231d61 FindwxWidgets: Support more wxWidgets versions, including 3.2
853449429d FindwxWidgets: Use version number from header for library names
ed51e0bb75 FindwxWidgets: Move extracting version number to a macro

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7448
 2022-07-05 17:35:06 -04:00
Brad King
4a8db1783c Merge topic 'FindwxWidgets-more-versions' into release-3.24 
2a19231d61 FindwxWidgets: Support more wxWidgets versions, including 3.2
853449429d FindwxWidgets: Use version number from header for library names
ed51e0bb75 FindwxWidgets: Move extracting version number to a macro

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7448
 2022-07-05 17:35:05 -04:00
Brad King
1d1b3ec199 Merge branch 'release-3.24' 2022-07-05 17:33:55 -04:00
Brad King
90f292db56 Merge topic 'doc-cpack-archive-component' 
5fa14ddecb Help: Document that CPack Archive Generator <component> is all uppercase

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7438
 2022-07-05 17:33:55 -04:00
Brad King
a5a442d9e5 Merge topic 'doc-cpack-archive-component' into release-3.24 
5fa14ddecb Help: Document that CPack Archive Generator <component> is all uppercase

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7438
 2022-07-05 17:33:54 -04:00
Brad King
6271f9f186 Merge branch 'release-3.24' 2022-07-05 17:32:28 -04:00
Brad King
7de107ca56 Merge topic 'doc-TARGET_FILE-depends' into release-3.24 
a4f0321ddc Help: Document $<TARGET_FILE> dependency behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7431
 2022-07-05 17:32:27 -04:00
Brad King
3c9f4f8389 Merge topic 'doc-TARGET_FILE-depends' 
a4f0321ddc Help: Document $<TARGET_FILE> dependency behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7431
 2022-07-05 17:32:27 -04:00