Commit Graph

57920 Commits

Author SHA1 Message Date
Craig Scott 76370e06b8 Help: Minor grammar fix for the Using Dependencies manual 2022-07-23 21:30:53 +10:00
Brad King 66077528f9 Merge topic 'doc-execute_process' into release-3.24
70c26a65b7 Help: Clarify execute_process OS-specific command-line encoding

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7492
2022-07-20 12:39:43 -04:00
Brad King 70c26a65b7 Help: Clarify execute_process OS-specific command-line encoding
Issue: #23557
2022-07-20 11:46:23 -04:00
Brad King 9306a5ab28 CMake 3.24.0-rc4 v3.24.0-rc4 2022-07-20 09:33:55 -04:00
Brad King 652b7c1f8f Merge topic 'vs-ZERO_CHECK-proj' into release-3.24
7219988b00 VS: Exclude ZERO_CHECK.proj from .sln for include_external_msproject

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7478
2022-07-20 09:25:10 -04:00
Brad King 80f2c5e3c8 Merge topic 'vs-csharp-debug-embedded' into release-3.24
fec515d5fb VS: Add CSharp flag table entry for '/debug:embedded'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7483
2022-07-20 08:55:58 -04:00
Sumit Bhardwaj 7219988b00 VS: Exclude ZERO_CHECK.proj from .sln for include_external_msproject
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
2022-07-20 08:51:38 -04:00
Brad King de8df25a20 Merge topic 'doc-example-target-sources' into release-3.24
c7c5a50b97 Help: Add missing PRIVATE keyword to target_sources() example

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7490
2022-07-20 08:45:53 -04:00
Brad King d6db6ffae8 Merge topic 'doc-restructure-genex-manual' into release-3.24
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
2022-07-20 08:44:58 -04:00
TheApplePieGod fec515d5fb VS: Add CSharp flag table entry for '/debug:embedded'
Fixes: #23713
2022-07-20 08:42:21 -04:00
Craig Scott c7c5a50b97 Help: Add missing PRIVATE keyword to target_sources() example
Fixes: #23746
2022-07-20 20:19:37 +10:00
Craig Scott d6af935467 Help: Add Whitespace And Quoting section to genex manual 2022-07-19 21:13:54 +10:00
Craig Scott 044c22e121 Help: Restructure reference sections of genex manual
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.
2022-07-19 21:13:52 +10:00
Craig Scott 3666486c28 Help: Move reference content to its own section at end of genex manual
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.
2022-07-19 21:11:27 +10:00
Craig Scott 22f8a626c3 Help: Add missing versionadded for CUDA genexes 2022-07-19 17:25:23 +10:00
Craig Scott c57c3dbbec Help: Genex manual typo, grammar, formatting, wording fixes 2022-07-19 16:45:04 +10:00
Craig Scott 2b102438f8 Help: Boolean genex conditions must evaluate to 1 or 0 2022-07-19 16:04:56 +10:00
Craig Scott d2cb36861f Help: Fix cross-references in genex manual that linked to wrong genexes 2022-07-19 14:18:01 +10:00
Brad King a47b203eeb Merge branch 'release-3.23' into release-3.24 2022-07-18 14:58:46 -04:00
Brad King 64b22cd459 Merge branch 'export-try-compile-crash' into release-3.23
Merge-request: !7472
2022-07-18 14:57:58 -04:00
Brad King 9d9c09b3df Merge topic 'doc-LINK_LIBRARIES_ONLY_TARGETS_direct_deps' into release-3.24
f585c61667 Help: LINK_LIBRARIES_ONLY_TARGETS also checks injected direct libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7466
2022-07-18 11:01:58 -04:00
Kyle Edwards df559cd8c8 Merge topic 'export-try-compile-crash' into release-3.24
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
2022-07-14 09:56:03 -04:00
Kyle Edwards 29c7546a61 cmGlobalGenerator: Only compute build files for all targets
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
2022-07-13 11:34:34 -04:00
Craig Scott f585c61667 Help: LINK_LIBRARIES_ONLY_TARGETS also checks injected direct libraries
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.
2022-07-10 18:15:22 +10:00
Brad King b2d550f45b Merge branch 'release-3.23' into release-3.24 2022-07-08 12:18:12 -04:00
Brad King 3bae50e830 Merge branch 'release-3.22' into release-3.23 2022-07-08 12:18:00 -04:00
Brad King 69ce5c0ce8 Merge topic 'rel-macos-sign-notarize' into release-3.24
432ae51467 Utilities/Release: Update macOS notarization script to use notarytool

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7463
2022-07-08 12:16:22 -04:00
Brad King 5924dc2a7e Merge branch 'rel-macos-sign-notarize' into release-3.23
Merge-request: !7463
2022-07-08 12:15:55 -04:00
Brad King d4762d46c7 Merge branch 'rel-macos-sign-notarize' into release-3.22
Merge-request: !7463
2022-07-08 12:15:31 -04:00
Brad King 432ae51467 Utilities/Release: Update macOS notarization script to use notarytool
`xcnotary` is no longer needed since `altool` has been deprecated in
favor of `notarytool`, which has builtin support for waiting.
2022-07-08 12:14:23 -04:00
Brad King 3fdbcfe8de Merge topic 'doc-INTERFACE_LINK_LIBRARIES_DIRECT' into release-3.24
6b103dd58a Help: Fix wrong property name INTERFACE_PROPERTY_LINK_DIRECT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7461
2022-07-08 10:54:43 -04:00
Craig Scott 6b103dd58a Help: Fix wrong property name INTERFACE_PROPERTY_LINK_DIRECT
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.
2022-07-08 09:19:54 -04:00
Brad King 95cce32470 CMake 3.24.0-rc3 v3.24.0-rc3 2022-07-07 11:02:54 -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 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 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 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 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
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 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
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 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 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 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