summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ccmake-fix-pdcurses-windows' into release-3.24Brad King2022-07-071-2/+4
|\ | | | | | | | | | | | | a78d10220c ccmake: Fix mangled configuration log with PDCurses on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7458
| * ccmake: Fix mangled configuration log with PDCurses on WindowsDuncan Ogilvie2022-07-061-2/+4
| | | | | | | | | | | | This fix seems to work on both Windows and Ubuntu (WSL). Issue: #18053
* | Merge topic 'genex-LINK_LIBRARY-check-supported-properties' into release-3.24Brad King2022-07-0724-28/+107
|\ \ | | | | | | | | | | | | | | | | | | | | | 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
| * | Genex LINK_LIBRARY and LINK_GROUP: check supported propertiesMarc Chevrier2022-07-0624-28/+107
| | | | | | | | | | | | | | | | | | | | | Refines check for properties supporting these genex. Enhance error message. Fixes: #23699
* | | Merge topic 'findwxwidgets-mingw-regression' into release-3.24Brad King2022-07-071-20/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | FindwxWidgets: Do not reset wxWidgets_LIB_DIR unnecessarilyMaarten Bent2022-07-061-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | 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`.
| * | | FindwxWidgets: Restore win32 find style on MinGWMaarten Bent2022-07-061-18/+9
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'release-3.23' into release-3.24Brad King2022-07-070-0/+0
|\ \ \
| * \ \ Merge branch 'release-3.22' into release-3.23Brad King2022-07-070-0/+0
| |\ \ \
| | * \ \ Merge branch 'FindLAPACK-nvhpc' into release-3.22Brad King2022-07-071-2/+7
| | |\ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !7452
| * | \ \ \ Merge branch 'FindLAPACK-nvhpc' into release-3.23Brad King2022-07-071-2/+7
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | Merge-request: !7452
* | | | | | Merge topic 'FindLAPACK-nvhpc' into release-3.24Brad King2022-07-071-2/+7
|\ \ \ \ \ \ | | |/ / / / | |/| | / / | |_|_|/ / |/| | | | | | | | | | | | | | 28d52a43fc FindLAPACK: Add '-fortranlibs' flag only with NVHPC/PGI compilers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7452
| * | | | FindLAPACK: Add '-fortranlibs' flag only with NVHPC/PGI compilersEisuke Kawashima2022-07-061-2/+7
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge topic 'genex-LINK_LIBRARY-fix-generation' into release-3.24Brad King2022-07-065-0/+23
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | e8792da04b genex-LINK_LIBRARY: ensure correct generation inside LINK_GROUP genex Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7443
| * | | genex-LINK_LIBRARY: ensure correct generation inside LINK_GROUP genexMarc Chevrier2022-07-055-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix ensures the following pattern is correctly handled: $<LINK_GROUP:group_feat,$<LINK_LIBRARY:lib_feat,mylib>> With: CMAKE_LINK_GROUP_USING_group_feat = "—START_GROUP" "—END_GROUP" CMAKE_LINK_LIBRARY_USING_lib_feat = "—PREFIX" "—LINK <LIBRARY>" "—SUFFIX" Before the fix, we get the following generation: —START_GROUP —PREFIX —LINK /path/to/mylib —END_GROUP —SUFFIX —END_GROUP and —SUFFIX are in the wrong order After the fix, we get the correct order: —START_GROUP —PREFIX —LINK /path/to/mylib —SUFFIX —END_GROUP
* | | | Merge topic 'FindwxWidgets-more-versions' into release-3.24Brad King2022-07-051-95/+54
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | FindwxWidgets: Support more wxWidgets versions, including 3.2Maarten Bent2022-07-051-40/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the example to use a more recent wxWidgets version. Use a list with known version numbers when searching for installation directories and wx-config names.
| * | | | FindwxWidgets: Use version number from header for library namesMaarten Bent2022-07-051-35/+12
| | | | |
| * | | | FindwxWidgets: Move extracting version number to a macroMaarten Bent2022-07-051-20/+24
| | | | |
* | | | | Merge topic 'doc-cpack-archive-component' into release-3.24Brad King2022-07-051-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5fa14ddecb Help: Document that CPack Archive Generator <component> is all uppercase Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7438
| * | | | | Help: Document that CPack Archive Generator <component> is all uppercaseDavid Faure2022-07-051-0/+2
| |/ / / /
* | | | | Merge topic 'doc-TARGET_FILE-depends' into release-3.24Brad King2022-07-051-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a4f0321ddc Help: Document $<TARGET_FILE> dependency behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7431
| * | | | | Help: Document $<TARGET_FILE> dependency behaviorRobert Maynard2022-07-051-0/+4
| |/ / / / | | | | | | | | | | | | | | | Fixes: #23686
* | | | | Merge topic 'docopt' into release-3.24Brad King2022-07-051-4/+6
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | ee6b429498 Help: Clarify that option() is a boolean Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7434
| * | | | Help: Clarify that option() is a booleanMichael Hirsch2022-07-051-4/+6
|/ / / / | | | | | | | | | | | | Also describe `option()` behavior in project vs. script mode.
* | | | Merge topic 'doc-CMP0131' into release-3.24Brad King2022-07-052-5/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 703900d166 Help: Mention CMP0131 in LINK_LIBRARIES docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7444
| * | | | Help: Mention CMP0131 in LINK_LIBRARIES docsCraig Scott2022-07-052-5/+8
| |/ / /
* | | | Merge topic 'nvhpc-Werror' into release-3.24Brad King2022-07-052-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35ec676ace NVHPC: warnings as error flag is "-Werror" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7415
| * | | | NVHPC: warnings as error flag is "-Werror"Robert Maynard2022-07-012-2/+2
| | | | |
* | | | | Merge topic 'add_nvcc_compile_warning_support' into release-3.24Brad King2022-07-0524-45/+92
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd324110d2 CUDA: NVCC support for COMPILE_WARNING_AS_ERROR target property 2e9ac1d272 Tests: Refactor warn on error tests to support multiple languages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7417
| * | | | CUDA: NVCC support for COMPILE_WARNING_AS_ERROR target propertyRobert Maynard2022-07-0110-1/+23
| | | | |
| * | | | Tests: Refactor warn on error tests to support multiple languagesRobert Maynard2022-06-2916-44/+69
| | | | |
* | | | | Merge topic 'LINK_LIBRARY-Darwin-LIBRARY-features-enhancements' into ↵Craig Scott2022-07-051-6/+6
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release-3.24 537861664a Genex LINK_LIBRARY: MacOS: enhance *_LIBRARY features c55d42eb42 Darwin.cmake: Fix indenting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7433
| * | | | Genex LINK_LIBRARY: MacOS: enhance *_LIBRARY featuresMarc Chevrier2022-07-031-3/+3
| | | | |
| * | | | Darwin.cmake: Fix indentingCraig Scott2022-07-031-3/+3
| | | | |
* | | | | Merge topic 'doc-LINK_LIBRARY_genex' into release-3.24Craig Scott2022-07-0313-454/+502
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d185f7c0a8 Help: Rework $<LINK_LIBRARY>, $<LINK_GROUP> and related docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7413
| * | | | | Help: Rework $<LINK_LIBRARY>, $<LINK_GROUP> and related docsCraig Scott2022-07-0313-454/+502
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes restructure the docs to improve readability and flow, correct grammar and typos, and fix errors and inconsistencies in some of the examples. Fixes: #23684
* | | | | Merge topic 'genex-TARGET_BUNDLE_DIR_NAME' into release-3.24Brad King2022-07-014-2/+49
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 8bd98b8117 Genex: Fix TARGET_BUNDLE_DIR_NAME incorrect extension Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7428
| * | | | Genex: Fix TARGET_BUNDLE_DIR_NAME incorrect extensionBen Leadbetter2022-07-014-2/+49
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the genex from commit 997af2e1a6 (Genex: Add TARGET_BUNDLE_DIR_NAME, 2022-04-14, v3.24.0-rc1~233^2) to use the correct bundle directory extension for each bundle type. Fixes: #23683
* | | | Merge branch 'release-3.23' into release-3.24Brad King2022-06-300-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'file-set-crash' into release-3.23Brad King2022-06-3010-4/+60
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !7420
* | \ \ \ Merge topic 'file-set-crash' into release-3.24Brad King2022-06-3010-4/+60
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 3fee5398bd install(EXPORT): Check for missing file sets at generate time Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7420
| * | | | install(EXPORT): Check for missing file sets at generate timeKyle Edwards2022-06-2910-4/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing file sets were originally checked at configure time in install(TARGETS ... EXPORT), but were not checked at generate time. If a file set was added after install(TARGETS ... EXPORT) was called, an abortion error was thrown. Check again at generate time to gracefully display an error message instead of crashing. Fixes: #23680
* | | | | Merge topic 'FetchContent-avoid-IN_LIST' into release-3.24Brad King2022-06-291-2/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c7b6b29f9 FetchContent: Don't use if(... IN_LIST ...) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7423
| * | | | | FetchContent: Don't use if(... IN_LIST ...)Craig Scott2022-06-281-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | This avoids the need for changing policy settings, which would then propagate through to projects brought into the build via FetchContent.
* | | | | | Merge topic 'fix-23523' into release-3.24Brad King2022-06-291-12/+16
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10668f26c9 AUTOUIC: Fix internal paths of generated ui_foo.h files Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7419
| * | | | | AUTOUIC: Fix internal paths of generated ui_foo.h filesJosiah Bills2022-06-281-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For every file foo.ui we generate a ui_foo.h file in ${target}_autogen/include or ${target}_autogen/include_$<CONFIG> in the multi-config case. Even .ui files in subdirectories are handled this way. That means, .ui files with the same base name will conflict in a target. However, for .ui files in subdirectories we added generated sources with the nonexistent path ${target}_autogen/include/subdir/ui_foo.h. This patch fixes that. Also, CMake will now yield an error if a target has multiple .ui files with the same base name. Fixes #23523
* | | | | | Merge topic 'FindPython-multiple-queries' into release-3.24Brad King2022-06-284-2/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ece3bedbf2 FindPython: fix error on multiple queries with different COMPONENTS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7410
| * | | | | | FindPython: fix error on multiple queries with different COMPONENTSMarc Chevrier2022-06-274-2/+26
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Ensure that multiple queries with different COMPONENTS specified in different sub-directories are fully supported.
* | | | | | Merge topic 'depguide-fetchcontent-versioning' into release-3.24Brad King2022-06-281-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d8d8ac772 Help: Mark features new to 3.24 in Using Dependencies Guide Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7411
generated by cgit v0.12 at 2025-01-25 20:31:46 (GMT)