Commit Graph

55188 Commits

Author SHA1 Message Date
Brad King bbc9a27e5f Merge topic 'GNUtoMS-vs2022'
571a795d2f GNUtoMS: Add search path for VS 2022 environment scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6695
2021-11-04 09:03:22 -04:00
Brad King 338c12152a Merge branch 'release-3.22' 2021-11-04 09:02:02 -04:00
Brad King 30be83c8a2 Merge topic 'ninja-pdb-dir'
73b84db62d Ninja: Fix creation of Windows import library directory
bd36735f65 cmNinjaTargetGenerator: Replace "their" with "there" in comment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6694
2021-11-04 09:02:02 -04:00
Brad King b15ac6416c Merge topic 'ninja-pdb-dir' into release-3.22
73b84db62d Ninja: Fix creation of Windows import library directory
bd36735f65 cmNinjaTargetGenerator: Replace "their" with "there" in comment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6694
2021-11-04 09:02:01 -04:00
Kitware Robot 909f435b93 CMake Nightly Date Stamp 2021-11-04 00:01:07 -04:00
Brad King 6251239a1c Merge topic 'C++-headers'
6f4727aaa0 Source: Replace C headers with C++ ones

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6657
2021-11-03 10:41:11 -04:00
Brad King d2a6df9f7c Merge topic 'no-opt-crash'
7c90d00af9 Tests: Prevent compiler optimizing away test code in CTestTestCrash

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6688
2021-11-03 10:40:03 -04:00
Brad King 4743b43126 Merge branch 'release-3.22' 2021-11-03 10:39:05 -04:00
Brad King 36afda49e6 Merge topic 'help_cmake_lang_extensions_default'
e9976c8827 Help: Better explain CMAKE_<LANG>_EXTENSIONS_DEFAULT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6686
2021-11-03 10:39:05 -04:00
Brad King f06f74ede7 Merge topic 'help_cmake_lang_extensions_default' into release-3.22
e9976c8827 Help: Better explain CMAKE_<LANG>_EXTENSIONS_DEFAULT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6686
2021-11-03 10:39:04 -04:00
Brad King 2f9b36eef0 Merge branch 'release-3.22' 2021-11-03 10:37:55 -04:00
Brad King 98f0ee645f Merge topic 'nvhpc-isystem'
92624714c4 NVHPC: Support SYSTEM include directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6691
2021-11-03 10:37:55 -04:00
Brad King 28d63320f1 Merge topic 'nvhpc-isystem' into release-3.22
92624714c4 NVHPC: Support SYSTEM include directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6691
2021-11-03 10:37:54 -04:00
Brad King 571a795d2f GNUtoMS: Add search path for VS 2022 environment scripts
Extend the logic from commit 08c5b3eff0 (GNUtoMS: Add search path for VS
2019 environment scripts, 2020-01-09, v3.16.3~15^2) to consider VS 2022
paths too.

Fixes: #22847
2021-11-03 10:32:14 -04:00
Brad King 73b84db62d Ninja: Fix creation of Windows import library directory
Call `EnsureParentDirectoryExists` with our internal representation
of the path, not the representation quoted/encoded for Ninja.

Fixes: #22841
2021-11-03 10:08:48 -04:00
Brad King bd36735f65 cmNinjaTargetGenerator: Replace "their" with "there" in comment 2021-11-03 10:08:47 -04:00
Kitware Robot 47846c5063 CMake Nightly Date Stamp 2021-11-03 00:02:13 -04:00
Rose 6f4727aaa0 Source: Replace C headers with C++ ones
In applicable areas only, of course.
2021-11-02 14:45:29 -04:00
Robert Maynard 92624714c4 NVHPC: Support SYSTEM include directories
Fixed #22834
2021-11-02 14:33:18 -04:00
Raul Tambre e9976c8827 Help: Better explain CMAKE_<LANG>_EXTENSIONS_DEFAULT
Explain that this represents the compiler's default and mustn't be modified
by the user. Clarify when it's used as the default.

Additionally:
* Add a reference to it in cmake-compile-features in text explaining the
  feature.
* Add explanations for the default initialization by
  `CMAKE_<LANG>_EXTENSIONS_DEFAULT` to all `<LANG>_EXTENSIONS` pages and
  references to CMP0128.
* Slightly reduce the wordiness of the default initialization explanations by
  removing an unnecessary "it is".

Fixes #22828.
2021-11-02 17:58:21 +02:00
William R. Dieter 7c90d00af9 Tests: Prevent compiler optimizing away test code in CTestTestCrash
The CTestTestCrash tries to force a crash by dereferencing a NULL
pointer.  The oneAPI 2021.4 C compiler notices that the pointer and the
value fetched from the pointer are never used and optimizes away the
dereferencing of the NULL pointer, which prevents the crash, causing
the test to fail.

This change adds the `volatile` keyword the pointer to prevent the
compiler optimizing it away.  Removing a reference to a `volatile`
variable is illegal because access to a `volatile` variable could have
side effects not observable by the compiler.

Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
2021-11-02 09:03:27 -04:00
Brad King 4e84a4763d Merge topic 'support_nvcc_native_flag'
14d8a2768d CUDA: Support nvcc 11.5 new -arch=all|all-major flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6652
2021-11-02 08:55:13 -04:00
Brad King d273175157 Merge topic 'ci-msvc-v71'
11903f1b5f ci: Add MSVC v71 NMake nightly CI job

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6687
2021-11-02 08:52:55 -04:00
Brad King 3b1f23b789 Merge topic 'update-kwsys'
37c2f722fc find_program: Explicitly skip WindowsApps/python*.exe app installer links
d8b5b0c7e4 Merge branch 'upstream-KWSys' into update-kwsys
e9ab6eeeb5 KWSys 2021-11-01 (572f2a65)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6679
2021-11-02 08:51:34 -04:00
Brad King 6abcae4d52 Merge branch 'release-3.22' 2021-11-02 08:50:02 -04:00
Brad King e958140f2a Merge topic 'doc-cpackrpm-versionadded'
a7a499a459 Help: Add `versionadded` for `CPACK_RPM_REQUIRES_EXCLUDE_FROM` variable
3eefb78512 Help: Use lower-case names of sphinx directives

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6684
2021-11-02 08:50:02 -04:00
Brad King 1cf99f66c7 Merge topic 'doc-cpackrpm-versionadded' into release-3.22
a7a499a459 Help: Add `versionadded` for `CPACK_RPM_REQUIRES_EXCLUDE_FROM` variable
3eefb78512 Help: Use lower-case names of sphinx directives

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6684
2021-11-02 08:50:01 -04:00
Brad King 6a5299d9eb Merge branch 'release-3.22' 2021-11-02 08:48:13 -04:00
Brad King d0e0d92882 Merge topic 'FindMPI-pkg-config'
56d949f05f FindMPI: Fix finding PkgConfg for fallback

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6685
2021-11-02 08:48:13 -04:00
Brad King e7fa6d45d4 Merge topic 'FindMPI-pkg-config' into release-3.22
56d949f05f FindMPI: Fix finding PkgConfg for fallback

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6685
2021-11-02 08:48:12 -04:00
Kitware Robot fed54aa362 CMake Nightly Date Stamp 2021-11-02 00:02:10 -04:00
Brad King 11903f1b5f ci: Add MSVC v71 NMake nightly CI job 2021-11-01 17:35:00 -04:00
Brad King e06f186c20 Merge topic 'vs-instance'
195d47e213 VS: Allow CMAKE_GENERATOR_INSTANCE to specify portable instance
ec8d37b3b1 VS: Support version specification in CMAKE_GENERATOR_INSTANCE
8e6d930e8c VS: Parse comma-separated fields from CMAKE_GENERATOR_INSTANCE
5d1f377737 cmVSSetupHelper: Factor out helper to load MSVC toolset version
006fe1e919 cmVSSetupHelper: Convert wide to narrow strings early
f5dfc788b8 cmVSSetupHelper: Drop unused InstanceId field
3213e2595d cmVSSetupHelper: Drop unused ullVersion field
152f9978dd Help: De-duplicate VS instance selection documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6651
2021-11-01 16:24:54 -04:00
Robert Maynard 14d8a2768d CUDA: Support nvcc 11.5 new -arch=all|all-major flags 2021-11-01 14:57:58 -04:00
Alex Turbov a7a499a459 Help: Add versionadded for CPACK_RPM_REQUIRES_EXCLUDE_FROM variable 2021-11-01 09:20:20 -04:00
Brad King 3eefb78512 Help: Use lower-case names of sphinx directives 2021-11-01 09:20:20 -04:00
Brad King dac334e35c Merge branch 'release-3.22' 2021-11-01 09:08:11 -04:00
Brad King 4c68a0e71a Merge topic 'envmod-test-modifying-existing'
9c4d6404eb Tests/Environment: also test modifying ambient values
7d52d48a32 cmCTestRunTest: get the default value from the environment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6682
2021-11-01 09:08:11 -04:00
Brad King 7ad6c1afd6 Merge topic 'envmod-test-modifying-existing' into release-3.22
9c4d6404eb Tests/Environment: also test modifying ambient values
7d52d48a32 cmCTestRunTest: get the default value from the environment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6682
2021-11-01 09:08:10 -04:00
Brad King 562ee8a50b Merge topic 'misc-messages'
dbe33b20bd install: Add context to {PUBLIC,PRIVATE}_HEADER/RESOURCE DESTINATION warnings
1a25f057da cmComputeLinkInformation: Add context to warning about linking a directory
4862f3b2c8 cmcmd: Write progress and tar errors directly to stderr
efc6c23a47 bootstrap: Do not declare cmSystemTools functions that are not implemented

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6680
2021-11-01 09:07:13 -04:00
Brad King 37c2f722fc find_program: Explicitly skip WindowsApps/python*.exe app installer links
Windows provide a "python" executable like this:

    %USERPROFILE%\AppData\Local\Microsoft\WindowsApps\python.exe

It is actually a Windows app exec link.  If it points to an app
installer, avoid mistaking it for a working Python.
2021-11-01 09:03:51 -04:00
Brad King d8b5b0c7e4 Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-11-01 (572f2a65)
2021-11-01 09:03:45 -04:00
KWSys Upstream e9ab6eeeb5 KWSys 2021-11-01 (572f2a65)
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 572f2a6592d671ecc865fe7821a0f4803deb9be7 (master).

Upstream Shortlog
-----------------

Brad King (3):
      025a4951 SystemTools: Add Windows app exec alias support to ReadSymlink
      f5b3500f SystemTools: Simplify FileIsExecutable on Windows
      bcddb31b SystemTools: Fix Windows app exec alias layout

Yuriy O'Donnell (1):
      29f31d17 SystemTools: Add Windows app exec alias support to FileExists()
2021-11-01 09:03:45 -04:00
Brad King 56d949f05f FindMPI: Fix finding PkgConfg for fallback
In commit 0723b2c935 (MPI: Add fallback detection code for MPI when cross
compiling, 2021-09-17, v3.22.0-rc1~89^2) the FindPkgConfig module was
included directly.  This produces warnings like:

    The package name passed to `find_package_handle_standard_args` (PkgConfig)
    does not match the name of the calling package (MPI).

Use `find_package(PkgConfig)` instead, as other find modules do.

Fixes: #22823
2021-11-01 08:09:15 -04:00
Kitware Robot f13b8a52ee CMake Nightly Date Stamp 2021-11-01 00:01:12 -04:00
Kitware Robot 56717f4c3c CMake Nightly Date Stamp 2021-10-31 00:02:09 -04:00
Kitware Robot 22f3892f9a CMake Nightly Date Stamp 2021-10-30 00:02:17 -04:00
Brad King 195d47e213 VS: Allow CMAKE_GENERATOR_INSTANCE to specify portable instance
Previously the `CMAKE_GENERATOR_INSTANCE` value was used only to filter
the instances reported by the Visual Studio Installer tool.  If the
specified install location is not known to the VS Installer, but the
user provided a `version=` field, check for the installation directly
on disk.

Fixes: #21639, #22197
2021-10-29 11:52:58 -04:00
Brad King ec8d37b3b1 VS: Support version specification in CMAKE_GENERATOR_INSTANCE 2021-10-29 11:52:58 -04:00
Brad King 8e6d930e8c VS: Parse comma-separated fields from CMAKE_GENERATOR_INSTANCE 2021-10-29 11:52:58 -04:00