Commit Graph

56573 Commits

Author SHA1 Message Date
Brad King 84fe677eae Merge topic 'tutorial-cmath' into release-3.23
5c84eca210 Tutorial: Simplify logic checking for cmath functions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7314
2022-06-02 09:21:05 -04:00
Brad King 5c84eca210 Tutorial: Simplify logic checking for cmath functions
Since commit 07223c5c27 (Tutorial: Update Step 5 to work on Windows,
2020-02-18, v3.18.0-rc1~655^2) the logic does not work on non-Windows
platforms when cmake is re-run on an existing build tree.  It is also
more complicated than we'd like for a tutorial example.  Avoid the need
to consider the `m` library case by performing the check as C++.

Since `check_cxx_symbol_exists` cannot handle overloaded functions
like `exp` and `log`, check with `check_cxx_source_compiles` instead.
This also presents a more general-purpose example in the tutorial.

Fixes: #23524
2022-06-01 13:57:47 -04:00
Brad King 18be0f9267 Merge branch 'release-3.22' into release-3.23 2022-06-01 12:03:43 -04:00
Brad King b243367b36 CMake 3.22.5 v3.22.5 2022-06-01 11:15:18 -04:00
Brad King 0ab3cb80fc Merge branch 'release-3.22' into release-3.23 2022-06-01 10:45:37 -04:00
Brad King a12cc91764 Merge branch 'release-3.21' into release-3.22 2022-06-01 10:45:23 -04:00
Brad King 97073b1991 CMake 3.21.7 v3.21.7 2022-06-01 09:53:26 -04:00
Brad King 3ede9ed771 Merge branch 'release-3.22' into release-3.23 2022-05-31 11:57:13 -04:00
Brad King c26255665a Merge branch 'release-3.21' into release-3.22 2022-05-31 11:56:43 -04:00
Brad King 245edf39fc Merge branch 'release-3.20' into release-3.21 2022-05-31 11:56:27 -04:00
Brad King eeb6dcad94 Merge topic 'cmake-gui-locale' into release-3.23
ae13524e3b cmake-gui: Restore support for internationalization with Qt5 on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7303
2022-05-31 11:55:08 -04:00
Brad King 5f6c4c86aa Merge branch 'cmake-gui-locale' into release-3.22
Merge-request: !7303
2022-05-27 12:02:11 -04:00
Brad King 7b3d228067 Merge branch 'cmake-gui-locale' into release-3.21
Merge-request: !7303
2022-05-27 12:02:01 -04:00
Brad King a539aed6bf Merge branch 'cmake-gui-locale' into release-3.20
Merge-request: !7303
2022-05-27 12:01:41 -04:00
Brad King ae13524e3b cmake-gui: Restore support for internationalization with Qt5 on Windows
Restore the logic removed by commit 035078d847 (cmake-gui: Remove
explicit locale setup, 2020-12-17, v3.20.0-rc1~205^2~6), but only with
Qt5 on Windows.  Leave a FIXME comment to support Qt6 later.

Fixes: #23562
Issue: #23565
2022-05-27 11:52:51 -04:00
Brad King a8bd06dfd4 CMake 3.23.2 v3.23.2 2022-05-25 09:42:51 -04:00
Brad King 8f2484e1b8 Merge topic 'doc-hip-genex-versionadded' into release-3.23
9f863cbd93 Help: Document when HIP_COMPILER generator expressions were added

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7289
2022-05-24 13:59:27 -04:00
Brad King a2fb6efd7f Merge branch 'release-3.22' into release-3.23 2022-05-24 13:36:38 -04:00
Brad King 38e1ec008d Merge topic 'backport-update-libarchive' into release-3.23
e2fe1d17e6 libarchive: Update build within CMake after changes in 3.5.3
ac5e524763 libarchive: include archive_platform.h first in blake2s sources
b93d8b1714 Merge branch 'upstream-LibArchive' into update-libarchive
9fd16c5b5b LibArchive 2022-02-08 (673c1eae)
de38c89252 libarchive: Update script to get 3.5.3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7294
2022-05-24 13:36:15 -04:00
Brad King d763ec0fdb Merge topic 'backport-update-libarchive' into release-3.22
e2fe1d17e6 libarchive: Update build within CMake after changes in 3.5.3
ac5e524763 libarchive: include archive_platform.h first in blake2s sources
b93d8b1714 Merge branch 'upstream-LibArchive' into update-libarchive
9fd16c5b5b LibArchive 2022-02-08 (673c1eae)
de38c89252 libarchive: Update script to get 3.5.3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7294
2022-05-24 13:35:06 -04:00
Brad King e2fe1d17e6 libarchive: Update build within CMake after changes in 3.5.3 2022-05-24 12:35:53 -04:00
Brad King ac5e524763 libarchive: include archive_platform.h first in blake2s sources
This is the libarchive convention in all other `.c` sources.  It ensures
that the configured `_WIN32_WINNT` value is defined before including any
system headers.
2022-05-24 12:35:26 -04:00
Brad King b93d8b1714 Merge branch 'upstream-LibArchive' into update-libarchive
* upstream-LibArchive:
  LibArchive 2022-02-08 (673c1eae)
2022-05-24 12:20:20 -04:00
LibArchive Upstream 9fd16c5b5b LibArchive 2022-02-08 (673c1eae)
Code extracted from:

    https://github.com/libarchive/libarchive.git

at commit 673c1eae896c837081a627807b9d5e990684dbf7 (v3.5.3).
2022-05-24 12:18:12 -04:00
Brad King de38c89252 libarchive: Update script to get 3.5.3 2022-05-24 12:17:57 -04:00
Eisuke Kawashima 9f863cbd93 Help: Document when HIP_COMPILER generator expressions were added
These were added by commit b50bfc8913 (HIP: Add language to CMake,
2020-08-28, v3.21.0-rc1~66^2~4).
2022-05-24 10:23:43 -04:00
Brad King 95ec7b4c1b Merge branch 'release-3.22' into release-3.23 2022-05-20 09:04:47 -04:00
Brad King f748ea2186 Merge topic 'vs2022-only' into release-3.23
235b5fb05b file(GET_RUNTIME_DEPENDENCIES): Support VS 2022 without VS 2019

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7282
2022-05-20 09:03:59 -04:00
Brad King a57652b0d6 Merge branch 'release-3.21' into release-3.22 2022-05-19 17:55:58 -04:00
Brad King 97ec556309 Merge branch 'vs2022-only' into release-3.22
Merge-request: !7282
2022-05-19 17:55:41 -04:00
Brad King f334235c19 Merge branch 'vs2022-only' into release-3.21
Merge-request: !7282
2022-05-19 17:55:04 -04:00
Brad King 235b5fb05b file(GET_RUNTIME_DEPENDENCIES): Support VS 2022 without VS 2019
Find MSVC tools in VS 2022 installation.
2022-05-19 17:50:06 -04:00
Brad King 2ca51e6f74 Merge topic 'cpack-nuget-components-on-windows' into release-3.23
066ff258db CPack/NuGet: Restore component packaging on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7280
2022-05-19 09:39:58 -04:00
Alex Turbov 066ff258db CPack/NuGet: Restore component packaging on Windows
The change from `\` to `/` in commit dade75509f (CPack/NuGet: Fix nuspec
file generation for UNIX-style OS, 2020-12-21, v3.20.0-rc1~243^2) does
not work on Windows.  Use `cmake_path` to form a path to an image
directory with preinstalled files.

Fixes: #22489
2022-05-18 11:12:02 -04:00
Brad King 640268c19b Merge topic 'ccmake-fix-infinite-loop-search' into release-3.23
432a8ab739 ccmake: Fix infinite loop during invalid search

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7269
2022-05-18 08:43:30 -04:00
Martin Duffy 432a8ab739 ccmake: Fix infinite loop during invalid search
Fix issue introduced in commit 2defe9ff95 (ccmake: Fix crash when
deleting all cache entries, 2022-05-12).

Leaving the Empty Cache widget always on the Entry list had unforeseen
consequences, including that it caused an infinite loop when searching
for a string that did not match any variables.
2022-05-18 08:04:10 -04:00
Brad King 44ccfdbe0b Merge topic 'clang-imsvc' into release-3.23
23a52561c7 Clang: Use -imsvc flag without space to support Clang tools

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Acked-by: hihig2001 <hihig@bluehole.net>
Merge-request: !7274
2022-05-18 08:02:09 -04:00
Brad King 23a52561c7 Clang: Use -imsvc flag without space to support Clang tools
Since commit bb61c2d024 (Clang: use -imsvc for system include dirs when
running on Windows, 2020-09-16, v3.19.0-rc1~162^2) we use the `-imsvc`
flag followed by the include directory as a separate argument.  Some
versions of `clang-tidy` do not support the flag unless the include
directory is attached to it, so use that form instead.

A similar fix was made by commit 3a8b6653dc (MSVC: Use -external:I flag
without space to support Clang tools, 2022-01-11, v3.22.2~8^2).

Fixes: #23517
2022-05-17 11:09:15 -04:00
Brad King 5b3096198a Merge branch 'release-3.22' into release-3.23 2022-05-17 08:48:45 -04:00
Brad King e05a476700 Merge topic 'FortranCInterface-gcc12' into release-3.23
cb616d43d6 FortranCInterface: Fix failure with gfortran 12 and Clang

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7266
2022-05-17 08:47:30 -04:00
Brad King 4a9e2a1572 Merge branch 'FortranCInterface-gcc12' into release-3.22
Merge-request: !7266
2022-05-16 11:19:29 -04:00
Brad King cb616d43d6 FortranCInterface: Fix failure with gfortran 12 and Clang
The C flags added by commit 6a0ce19ce1 (FortranCInterface: Fix
compatibility with GCC gfortran 12 LTO, 2022-01-19, v3.22.2~5^2)
should only be added for the GNU C compiler.

Fixes: #23500
Issue: #23123
2022-05-16 11:18:00 -04:00
Brad King 29d23ec2cf Merge topic 'cuda-arch-off-vs' into release-3.23
9fe41ecf36 VS: Fix CUDA CodeGeneration field for CMAKE_CUDA_ARCHITECTURES=OFF

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !7261
2022-05-16 09:24:52 -04:00
Brad King 9fe41ecf36 VS: Fix CUDA CodeGeneration field for CMAKE_CUDA_ARCHITECTURES=OFF
If we add no CUDA architecture flags, write an empty `CodeGeneration`
field to tell the CUDA Toolkit's VS integration not to add its default
flags.  We already use this approach for `CMAKE_CUDA_ARCHITECTURES=all`
so that the `-arch=all` flag can be added via `AdditionalOptions`.

Fixes: #23490
2022-05-13 11:34:51 -04:00
Brad King c1d980f722 Merge topic 'ccmake-delete-cache' into release-3.23
2defe9ff95 ccmake: Fix crash when deleting all cache entries
e1c85e29f4 ccmake: Move Initialization of Fields Inline

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7257
2022-05-13 08:45:50 -04:00
Brad King f8a148f68c Merge branch 'release-3.22' into release-3.23 2022-05-13 08:43:22 -04:00
Brad King 165208c784 Merge topic 'FindPkgConfig-LIBRARY_PATH' into release-3.23
11c8da94d4 FindPkgConfig: Fix preservation of ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS}

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7258
2022-05-13 08:42:48 -04:00
Brad King a0a1166935 Merge topic 'FindPython-3.12' into release-3.23
ca2877c039 FindPython: add support for Python 3.12

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7255
2022-05-13 08:41:55 -04:00
Brad King 384c7521c4 Merge topic 'ci-msvc-19.32' into release-3.23
cc93d2af08 gitlab-ci: Update Windows builds to MSVC 19.32 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7259
2022-05-13 08:40:45 -04:00
Brad King cc93d2af08 gitlab-ci: Update Windows builds to MSVC 19.32 toolset 2022-05-12 17:47:44 -04:00