summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.24.0-rc4v3.24.0-rc4Brad King2022-07-201-1/+1
|
* Merge topic 'vs-ZERO_CHECK-proj' into release-3.24Brad King2022-07-209-1/+63
|\ | | | | | | | | | | | | 7219988b00 VS: Exclude ZERO_CHECK.proj from .sln for include_external_msproject Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7478
| * VS: Exclude ZERO_CHECK.proj from .sln for include_external_msprojectSumit Bhardwaj2022-07-209-1/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In `cmGlobalVisualStudio7Generator::WriteTargetsToSolution`, we skip writing `ZERO_CHECK.proj` to solution file as the check in `cmGlobalVisualStudioGenerator::IsInSolution` returns `false` for `ZERO_CHECK`. However, we write ZERO_CHECK to ProjectDependencies for external projects as there are no checks in `cmGlobalVisualStudio71Generator::WriteExternalProject`. Similar to `cmGlobalVisualStudioGenerator::IsInSolution`, we introduce `IsDepInSolution(const std::string&)` which excludes `ZERO_CHECK.proj` from being added to sln file for the cases where we have `ZERO_CHECK.proj`. Fixes: #23708
* | Merge topic 'vs-csharp-debug-embedded' into release-3.24Brad King2022-07-207-0/+49
|\ \ | | | | | | | | | | | | | | | | | | fec515d5fb VS: Add CSharp flag table entry for '/debug:embedded' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7483
| * | VS: Add CSharp flag table entry for '/debug:embedded'TheApplePieGod2022-07-207-0/+49
| | | | | | | | | | | | Fixes: #23713
* | | Merge topic 'doc-example-target-sources' into release-3.24Brad King2022-07-201-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c7c5a50b97 Help: Add missing PRIVATE keyword to target_sources() example Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7490
| * | | Help: Add missing PRIVATE keyword to target_sources() exampleCraig Scott2022-07-201-2/+2
| |/ / | | | | | | Fixes: #23746
* | | Merge topic 'doc-restructure-genex-manual' into release-3.24Brad King2022-07-201-915/+1007
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d6af935467 Help: Add Whitespace And Quoting section to genex manual 044c22e121 Help: Restructure reference sections of genex manual 3666486c28 Help: Move reference content to its own section at end of genex manual 22f8a626c3 Help: Add missing versionadded for CUDA genexes c57c3dbbec Help: Genex manual typo, grammar, formatting, wording fixes 2b102438f8 Help: Boolean genex conditions must evaluate to 1 or 0 d2cb36861f Help: Fix cross-references in genex manual that linked to wrong genexes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7479
| * | Help: Add Whitespace And Quoting section to genex manualCraig Scott2022-07-191-0/+87
| | |
| * | Help: Restructure reference sections of genex manualCraig Scott2022-07-191-872/+866
| | | | | | | | | | | | | | | | | | | | | | | | As part of the general restructuring, also move the notes of a more introductory nature out of what was the "String-Valued Generator Expressions" section and up to the dedicated Introduction. This gives the reader a bit more of a foundation before they get to the heavier detail of the reference section.
| * | Help: Move reference content to its own section at end of genex manualCraig Scott2022-07-191-49/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This involves moving the Debugging section up to just after the introduction. The content of that section is unchanged. The reference section then follows, and since it is a dedicated section, all existing sections thereunder were demoted one level. Move the note about deviating from the usual CMake docs convention of using angle brackets around placeholders out of the Introduction and to the start of the reference section. No placeholders are used before that point, so that content no longer belongs in the introduction. Apply some minor wording cleanup to the content in the Introduction that remained.
| * | Help: Add missing versionadded for CUDA genexesCraig Scott2022-07-191-0/+4
| | |
| * | Help: Genex manual typo, grammar, formatting, wording fixesCraig Scott2022-07-191-35/+35
| | |
| * | Help: Boolean genex conditions must evaluate to 1 or 0Craig Scott2022-07-191-5/+8
| | |
| * | Help: Fix cross-references in genex manual that linked to wrong genexesCraig Scott2022-07-191-4/+4
| | |
* | | Merge branch 'release-3.23' into release-3.24Brad King2022-07-180-0/+0
|\ \ \ | |_|/ |/| |
| * | Merge branch 'export-try-compile-crash' into release-3.23Brad King2022-07-183-1/+13
| |\ \ | | | | | | | | | | | | Merge-request: !7472
* | \ \ Merge topic 'doc-LINK_LIBRARIES_ONLY_TARGETS_direct_deps' into release-3.24Brad King2022-07-181-0/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | f585c61667 Help: LINK_LIBRARIES_ONLY_TARGETS also checks injected direct libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7466
| * | | Help: LINK_LIBRARIES_ONLY_TARGETS also checks injected direct librariesCraig Scott2022-07-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The INTERFACE_LINK_LIBRARIES_DIRECT property can add direct link dependencies to the target at the head of the dependency chain. The checks associated with LINK_LIBRARIES_ONLY_TARGETS also apply to these link items, but the documentation wasn't updated to reflect this when the INTERFACE_LINK_LIBRARIES_DIRECT support was added.
* | | | Merge topic 'export-try-compile-crash' into release-3.24Kyle Edwards2022-07-143-1/+13
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | 29c7546a61 cmGlobalGenerator: Only compute build files for all targets Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7472
| * | cmGlobalGenerator: Only compute build files for all targetsKyle Edwards2022-07-133-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | If we're creating generation objects for imported targets only, we don't need the export sets. Only compute build file generators if generating for all targets. Fixes: #23709
* | | Merge branch 'release-3.23' into release-3.24Brad King2022-07-080-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'release-3.22' into release-3.23Brad King2022-07-080-0/+0
| |\ \
| | * \ Merge branch 'rel-macos-sign-notarize' into release-3.22Brad King2022-07-081-18/+25
| | |\ \ | | | | | | | | | | | | | | | Merge-request: !7463
| * | \ \ Merge branch 'rel-macos-sign-notarize' into release-3.23Brad King2022-07-081-18/+25
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Merge-request: !7463
* | | | | Merge topic 'rel-macos-sign-notarize' into release-3.24Brad King2022-07-081-18/+25
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 432ae51467 Utilities/Release: Update macOS notarization script to use notarytool Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7463
| * | | | Utilities/Release: Update macOS notarization script to use notarytoolBrad King2022-07-081-18/+25
| | |/ / | |/| | | | | | | | | | | | | | `xcnotary` is no longer needed since `altool` has been deprecated in favor of `notarytool`, which has builtin support for waiting.
* | | | Merge topic 'doc-INTERFACE_LINK_LIBRARIES_DIRECT' into release-3.24Brad King2022-07-081-15/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b103dd58a Help: Fix wrong property name INTERFACE_PROPERTY_LINK_DIRECT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7461
| * | | | Help: Fix wrong property name INTERFACE_PROPERTY_LINK_DIRECTCraig Scott2022-07-081-15/+15
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the name of a placeholder used for some documentation in `Help/prop_tgt/INTERFACE_LINK_LIBRARIES_DIRECT.txt` that is included in multiple documents. During development iterations, much of the content was moved to just `Help/prop_tgt/INTERFACE_LINK_LIBRARIES_DIRECT.rst`, but the placeholder was not correctly replaced by its property name.
* | | | CMake 3.24.0-rc3v3.24.0-rc3Brad King2022-07-071-1/+1
| | | |
* | | | 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