https://github.com/Kitware/CMake

sort by:
Revision Author Date Message Commit Date
6e9eaf2 CMake 3.22.3 04 March 2022, 17:06:35 UTC
e7c9304 Merge branch 'release-3.21' into release-3.22 04 March 2022, 16:54:30 UTC
78ae759 CMake 3.21.6 04 March 2022, 15:52:43 UTC
5419cc3 Merge branch 'while-bug-compatibility' into release-3.22 Merge-request: !7041 03 March 2022, 21:54:35 UTC
da2361f while: Restore tolerance of condition error Since commit 880ca66b51 (Fix: `while()` can silently ignore incorrect condition, 2021-08-09, v3.22.0-rc1~238^2~4) we correctly reject the code set(paren "(") while(${paren}) endwhile() However, rejecting it breaks compatibility with projects that used such code accidentally. In CMake 3.21 and below, any error in the condition was ignored because the `false` result exited the loop first. Restore tolerance of the error for now. A policy will be needed to make it an error later. Note that the same condition with `if` was always correctly rejected. Fixes: #22524 Issue: #23296 Co-authored-by: Brad King <brad.king@kitware.com> 03 March 2022, 21:51:34 UTC
47d1977 Tests: Simplify RunCMake.{if,while} unbalanced parenthesis cases 03 March 2022, 21:51:34 UTC
4331f97 Merge branch 'release-3.21' into release-3.22 03 March 2022, 17:58:14 UTC
7edc09b Merge branch 'binutils-llvm-ar-clang-macos' into release-3.22 Merge-request: !7039 03 March 2022, 17:58:00 UTC
e47e5c7 Merge branch 'binutils-llvm-ar-clang-macos' into release-3.21 Merge-request: !7039 03 March 2022, 17:55:33 UTC
29ea94e BinUtils: Avoid llvm-ar on Apple platforms Since commit cf82300a63 (BinUtils: Clarify search logic and make it more consistent, 2021-05-27, v3.21.0-rc1~119^2~2) we correctly prefer the more-specific name `llvm-ar` over `ar` when using Clang. However, on Apple platforms, `llvm-ar` does not generate a symbol table that the Apple linker accepts. Fall back to `ar` on Apple platforms. Fixes: #23269 03 March 2022, 17:54:10 UTC
371235e Merge branch 'release-3.21' into release-3.22 28 February 2022, 18:09:25 UTC
7a16688 Merge branch 'FindThreads-revert-libc-pthread-flag' into release-3.22 Merge-request: !7025 28 February 2022, 18:09:19 UTC
02b04f1 Merge branch 'FindThreads-revert-libc-pthread-flag' into release-3.21 Merge-request: !7025 28 February 2022, 18:09:00 UTC
c6da90b FindThreads: Revert "Honor THREADS_PREFER_PTHREAD_FLAG when ... in libc" Revert commit 5efb6fb516 (FindThreads: Honor THREADS_PREFER_PTHREAD_FLAG when pthread is found in libc, 2021-11-03, v3.21.5~4^2). The check for the `-pthread` flag can pass on compilers like XL, that interprets it as `-p -t hread` and returns zero. Prior to that commit, we did not use the check in the `CMAKE_HAVE_LIBC_PTHREAD` code path. Now we do, it succeeds, and we incorrectly add the `-pthread` flag for XL. This change was backported to the 3.21 and 3.22 release series long after they initially came out. Since there may be more cases where we now add `-pthread` incorrectly, it is simplest to revert the change in all release series pending further investigation. Fixes: #23270 28 February 2022, 17:53:15 UTC
fa9bba4 Merge branch 'test-qt-disable' into release-3.22 Merge-request: !6998 17 February 2022, 16:11:20 UTC
5bfff3c Tests: Add missing guards on Qt4 and Qt5 tests Add missing `CMake_TEST_Qt{4,5}` conditions on Qt4 an Qt5 tests. Configuring CMake with `-DCMake_TEST_Qt5=OFF` should prevent any attempt to search for Qt5. Fixes: #23239 17 February 2022, 16:00:25 UTC
3596758 Merge branch 'FindGLUT-link-dirs' into release-3.22 Merge-request: !6985 15 February 2022, 15:37:11 UTC
44f7238 FindGLUT: Use link directories for libs from pkg-config Since commit f90d15458a (FindGLUT: Use pkg-config to find flags if available, 2021-06-11, v3.22.0-rc1~469^2), the `GLUT_LIBRARIES` may come from `pkg-config`, in which case they may be `-l` flags instead of absolute paths. Propagate `GLUT_LIBRARY_DIRS` to GLUT::GLUT too. Fixes: #23229 15 February 2022, 15:35:11 UTC
a16cefe Merge branch 'FindMatlab-mcr911' into release-3.22 Merge-request: !6976 14 February 2022, 15:24:51 UTC
b8d885e FindMatlab: Fix version detection for MCR >= 9.10 Recent MCR versions have the following `VersionInfo.xml`: <version>9.11.0.1837725</version> Fix parsing of multiple digits in the version components so that we do not mistake this for version `9.1`. 14 February 2022, 15:23:33 UTC
e6e9c8e Merge branch 'restore-target-export-includes' into release-3.22 Merge-request: !6969 14 February 2022, 14:48:10 UTC
83d7963 install(TARGETS): Restore per-export INCLUDES DESTINATION In commit 55e4753bbb (Refactor cmTargetExport removing InterfaceIncludeDirecories, 2021-07-20, v3.22.0-rc1~337^2~1) the storage of `INCLUDES DESTINATION` was moved into each target. However, a target may be installed in multiple exports, and their `INCLUDES DESTINATION` should not be mixed. Convert the IncludeDirectoriesEntries vector to a map and modify access function to store the directories lists with respect to cmExportTarget object. This fixes error when the same target is exported more than once via different exports and each for consequent export its include directories list grows. Add a test for this case. Fixes: #23183 09 February 2022, 18:31:26 UTC
21d8a86 Merge branch 'release-3.21' into release-3.22 09 February 2022, 15:09:55 UTC
1a30d3a Merge branch 'backport-IntelLLVM-depfile-flags' into release-3.22 Merge-request: !6964 09 February 2022, 15:09:51 UTC
be20a94 Merge branch 'backport-IntelLLVM-depfile-flags' into release-3.21 Merge-request: !6964 09 February 2022, 15:09:28 UTC
a8b6bf9 IntelLLVM: Add dependencies on system header files on Windows In commit a90d2a9eed (IntelLLVM: Add support for Intel LLVM-based compilers, 2020-11-02, v3.20.0-rc1~89^2~20) the IntelLLVM depfile generation flags were taken from `Platform/Windows-Intel-C`. Those flags were added by commit a624a3e1b3 (Ninja: Use deps=gcc for Intel Compiler on Windows, 2019-01-30, v3.14.0-rc1~30^2), which forgot to account for commit 6d74e7870b (Ninja: Add dependencies on system-provided header files, 2016-03-15, v3.6.0-rc1~265^2). The `-QMD` option generates Makefile dependencies. The `-QMMD` option generates Makefile dependencies, but excludes system header files. Part of the BuildDepends test includes a header, cmake_pch.hxx, that includes a second header, zot_pch.hxx. The test builds a pch file for cmake_pch.hxx, touches zot_pch.hxx, then verifes that cmake_pch.hxx.pch is regenerated based on the dependencies. The cmake_pch.hxx contains `#pragma system_header` before it includes zot_pch.hxx. `#pragma system_header` indicates that the portion of the file following the pragma is to be treated as a system header. When `-QMMD` is used to generate dependencies, the `#include` of zot_pch.hxx is ignored because it `-QMMD` says to ignore system headers. Using `-QMD` instead uses all headers when generating dependencies and causes this test to pass. The Clang configuration in Platform/Windows-Clang.cmake also uses the `-MD` option for generating pre-compiled headers, instead of `-MMD`. Signed-off-by: William R. Dieter <william.r.dieter@intel.com> 09 February 2022, 15:07:51 UTC
94f1bbd Intel: Add dependencies on system header files on Windows In commit a624a3e1b3 (Ninja: Use deps=gcc for Intel Compiler on Windows, 2019-01-30, v3.14.0-rc1~30^2) we forgot to account for commit 6d74e7870b (Ninja: Add dependencies on system-provided header files, 2016-03-15, v3.6.0-rc1~265^2). 09 February 2022, 15:07:51 UTC
298bf1e Merge branch 'doc-MSVC_TOOLSET_VERSION-v143' into release-3.22 Merge-request: !6966 09 February 2022, 14:54:44 UTC
4423fa2 Merge branch 'doc-MSVC_TOOLSET_VERSION-v143' into release-3.21 Merge-request: !6966 09 February 2022, 14:54:18 UTC
dca3a03 Help: Add MSVC_TOOLSET_VERSION value for v143 toolset This was accidentally left out of commit f01ea7e391 (MSVC: Fix MSVC_TOOLSET_VERSION for VS 2022 v143 toolset, 2019-04-03, v3.21.3~10^2~1). 09 February 2022, 14:53:11 UTC
b91c4df Merge branch 'FindGSL-version-regex' into release-3.22 Merge-request: !6960 08 February 2022, 15:31:16 UTC
b67ff61 FindGSL: Improve version extraction regex Backport commit 58f2708b90 (FindGSL: Improve version extraction regex, 2021-12-17) to the CMake 3.22 branch. Fixes: #23017 08 February 2022, 15:21:15 UTC
d60647a Merge branch 'default-extensions' into release-3.22 Merge-request: !6949 03 February 2022, 17:52:45 UTC
4ef6e27 CompilerId: Fix default extensions check for Clang targeting MSVC ABI In commit fc3a1cbdd8 (CompilerID: Compiler extensions default detection, 2021-05-29, v3.22.0-rc1~52^2~2), extensions were assumed to be `OFF` for Clang targeting the MSVC ABI. However, the `clang` and `clang++` tools both seem to have extensions enabled by default even when targeting the MSVC ABI. This can be observed with the `RunCMake.CompileFeatures` test. It fails with the GNU-like `clang/clang++` front-end, but removing the above special case makes it pass. The test passes either way with the MSVC-like `clang-cl` front-end. 03 February 2022, 17:06:00 UTC
17f9714 Merge branch 'release-3.21' into release-3.22 01 February 2022, 17:08:05 UTC
6fe5df1 CMake 3.21.5 01 February 2022, 15:54:10 UTC
68ab7b1 Merge branch 'ci-assertions' into release-3.22 Merge-request: !6927 01 February 2022, 15:27:24 UTC
79aa2c5 Merge branch 'release-3.21' into release-3.22 01 February 2022, 14:51:43 UTC
cb66d25 Merge topic 'help-try-compile-result-var' into release-3.22 34d263270e Help: Drop incorrect versionadded for try_compile result variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6923 01 February 2022, 14:50:40 UTC
fc27354 Merge branch 'release-3.20' into release-3.21 31 January 2022, 16:36:57 UTC
d647ca1 Merge branch 'help-try-compile-result-var' into release-3.21 Merge-request: !6923 31 January 2022, 16:36:46 UTC
d6bfce2 Merge branch 'help-try-compile-result-var' into release-3.20 Merge-request: !6923 31 January 2022, 16:35:58 UTC
45feab3 gitlab-ci: enable assertions on fedora34-ninja jobs We should have at least one CI job in merge request pipelines that builds CMake with assertions enabled. We avoid using the `Debug` configuration in order to keep CI artifacts small, so instead use the `Release` configuration without `-DNDEBUG`. 31 January 2022, 16:34:12 UTC
34d2632 Help: Drop incorrect versionadded for try_compile result variable In commit c705279bae (Help: Add `.. versionadded` directives to commands documentation, 2020-11-08, v3.20.0-rc1~508^2) we accidentally added ``versionadded`` markup suggesting that the first argument to `try_compile` was fixed as `RESULT_VAR` prior to CMake 3.14. This was probably due to misinterpreting the change from commit 7975edeac5 (Help: User-provided variable names for try_* commands, 2019-02-24, v3.14.0-rc3~16^2~3). The result variable has never been fixed. Drop the incorrect markup. 31 January 2022, 15:59:56 UTC
7446601 Merge topic 'iar_cmp0057' into release-3.22 cc4da8d13a IAR/CXX: Fix compatibility with CMP0057 OLD Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6921 31 January 2022, 15:31:30 UTC
cc4da8d IAR/CXX: Fix compatibility with CMP0057 OLD Commit a9073db7 (IAR: update language specification detection, 2021-09-23) added usage of the if() IN_LIST operation and forgot to account for it not being available in CMP0057 OLD mode. Push and temporarily enable the policy. Also avoid the unnecessary temporary variable for the list. Fixes #23147. 29 January 2022, 20:55:24 UTC
b1325f5 Merge branch 'release-3.21' into release-3.22 28 January 2022, 14:37:06 UTC
71fa8f5 Merge topic 'message-flush' into release-3.22 634587e322 message: Restore explicit flushing of messages on stderr Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6913 28 January 2022, 14:36:01 UTC
9025bde Merge branch 'message-flush' into release-3.21 Merge-request: !6913 27 January 2022, 21:25:41 UTC
634587e message: Restore explicit flushing of messages on stderr In the `cmake` command-line tool, the `message()` command with no message mode argument prints the message stderr using the C++ `cerr` stream. Since commit 0a0a0f8a74 (cmMessenger: Color messages to terminal by type, 2021-05-18, v3.21.0-rc1~146^2) and an update by commit c7a8c9c811 (cmMessenger: Revert to non-color messages on Windows, 2021-07-20, v3.21.1~15^2), we print the newline at the end of the message using just `\n`. We've now observed some cases of output on stdout and stderr getting jumbled when the two go to the same file descriptor. Previously the newline was printed with `endl`, which implicitly flushes. Flush explicitly to restore that behavior. Fixes: #23155 27 January 2022, 21:06:35 UTC
206a2cc Merge branch 'release-3.21' into release-3.22 27 January 2022, 16:07:06 UTC
5588b53 Merge topic 'nmake-rsp-encoding' into release-3.22 d5ee6d50ee NMake: Use UTF-8 BOM in response files only with MSVC tooling cab631c2e2 NMake: Document response file encoding heuristic in a comment Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6905 27 January 2022, 16:05:03 UTC
6a037fd Merge topic 'FindThreads-libc-pthread-flag' into release-3.22 5efb6fb516 FindThreads: Honor THREADS_PREFER_PTHREAD_FLAG when pthread is found in libc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6906 27 January 2022, 16:04:06 UTC
fc153c7 Merge branch 'FindThreads-libc-pthread-flag' into release-3.21 Merge-request: !6906 26 January 2022, 13:54:00 UTC
5efb6fb FindThreads: Honor THREADS_PREFER_PTHREAD_FLAG when pthread is found in libc The `-pthread` flag tells the compiler/linker to link to additional libraries needed for thread support (e.g. libatomic on riscv64). The flag therefore should be used if requested using `THREADS_PREFER_PTHREAD_FLAG` also when the pthread functions are found in libc. 26 January 2022, 13:50:16 UTC
ece5378 Merge branch 'nmake-rsp-encoding' into release-3.21 Merge-request: !6905 26 January 2022, 13:45:11 UTC
94189fc Merge topic 'FindMPI-static-first' into release-3.22 036d0cbbde FindMPI: Place static first in mpi test source Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6900 26 January 2022, 13:04:14 UTC
d5ee6d5 NMake: Use UTF-8 BOM in response files only with MSVC tooling Since commit f3f57cc4ed (NMake: Use UTF-8 with BOM if supported by nmake, 2021-04-22, v3.21.0-rc1~217^2), we add a BOM to response files to tell MSVC tooling that they are encoded as UTF-8. However, the "NMake Makefiles" generator may also be used with non-MSVC toolchains that do not understand the BOM. Update the response file encoding selection heuristic to add the BOM only with MSVC tooling. Fixes: #23143 26 January 2022, 12:57:43 UTC
cab631c NMake: Document response file encoding heuristic in a comment Since commit f3f57cc4ed (NMake: Use UTF-8 with BOM if supported by nmake, 2021-04-22, v3.21.0-rc1~217^2) the encoding of response files is selected based on the makefile encoding. In principle these may be orthogonal, but in practice it is a useful heuristic. Call out this heuristic in a comment, and leave a FIXME to do something better. 26 January 2022, 12:40:36 UTC
036d0cb FindMPI: Place static first in mpi test source Move the `static` added by commit 8cce0ad32f (FindMPI: Fix missing static warning in the mpi test source, 2021-06-30, v3.22.0-rc1~502^2) to the beginning of the line. Fixes: #23141 25 January 2022, 14:53:24 UTC
8428e39 CMake 3.22.2 25 January 2022, 13:45:06 UTC
6e60257 Merge topic 'doc-3.22-patches' into release-3.22 1461eff899 Help: Add missing 3.22.1 section to the release notes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6895 25 January 2022, 13:20:43 UTC
2a620b3 Merge branch 'release-3.21' into release-3.22 25 January 2022, 11:56:48 UTC
7f7f3ba Merge topic 'ci-xcode-13.2' into release-3.22 8cb32fc8ad gitlab-ci: update macOS jobs to use Xcode 13.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6897 25 January 2022, 11:55:45 UTC
74f1499 Merge branch 'ci-xcode-13.2' into release-3.21 Merge-request: !6897 25 January 2022, 10:43:40 UTC
8cb32fc gitlab-ci: update macOS jobs to use Xcode 13.2 25 January 2022, 10:06:40 UTC
1461eff Help: Add missing 3.22.1 section to the release notes 3.22.1 had no release notes because there were no changes to documented features or interfaces. Now that we have a 3.22.2 section, add one for the previous patch release to avoid confusion. 24 January 2022, 17:41:27 UTC
b13be86 Merge topic 'cmp0128_cuda' into release-3.22 ee1396e29e CMP0128: Add flag in OLD mode even when standard matches the default b2c25de8e0 CMP0128: Avoid test code duplication 3a089cd256 CMP0128: Prefix test names with mode e13dd52535 XL: Detect default extensions mode for legacy compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6890 24 January 2022, 17:37:51 UTC
ee1396e CMP0128: Add flag in OLD mode even when standard matches the default Commit 4a0485be (cmStandardLevelResolver: Avoid unnecessary flags, fix unset level logic, 2021-04-29) unintentionally changed the behavior by modifying the code to match a pre-existing comment. The resulting behavior change however matches the intentions of CMP0128, so we simply need to guard it. Fixes #23122. 23 January 2022, 21:10:28 UTC
b2c25de CMP0128: Avoid test code duplication 23 January 2022, 21:10:28 UTC
3a089cd CMP0128: Prefix test names with mode Makes clear that these tests are for the NEW behaviour. 23 January 2022, 21:10:28 UTC
e13dd52 XL: Detect default extensions mode for legacy compiler The legacy non-Clang variant seems to support a GNU-like extensions mode, which is the default. Enable detection for it. 23 January 2022, 21:10:28 UTC
a5109e6 Merge topic 'FortranCInterface-gcc-12-lto' into release-3.22 6a0ce19ce1 FortranCInterface: Fix compatibility with GCC gfortran 12 LTO Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6879 20 January 2022, 16:58:04 UTC
6a0ce19 FortranCInterface: Fix compatibility with GCC gfortran 12 LTO Since version 12.0 the GCC Fortran compiler has implemented "WG5/N1942", which causes, if link-time opmization is enabled, obfuscation of hard-coded string values in the compiler objects and its resulting ELF-binaries. This causes the CMake-internal detection of the mangling scheme for the naming of subroutines to fail. Thus we must ensure to have any link-time optimization features to be disabled on the executable file we perform the detection on. The static libraries, however, must be build with LTO and non-LTO objects, as that will ensure the verify step will operate on IPO objects, if building those is requested by the system compiler flags. Fixes: #23123 Signed-off-by: Björn Esser <besser82@fedoraproject.org> 19 January 2022, 19:47:38 UTC
d79c40b Merge branch 'release-3.21' into release-3.22 13 January 2022, 20:20:44 UTC
f47ffab Merge topic 'vs2022-v143-link-guard-cf' into release-3.22 9e24437c91 VS: Remove the '/guard:cf' flag from v143 link flag table Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6858 13 January 2022, 20:18:48 UTC
88198e6 Merge branch 'vs2022-v143-link-guard-cf' into release-3.21 Merge-request: !6858 12 January 2022, 21:53:51 UTC
9e24437 VS: Remove the '/guard:cf' flag from v143 link flag table Apply the change from commit db35e3cfd6 (VS: Fix support for '/guard:cf' linker flag for v142, 2019-01-24, v3.14.0-rc1~74^2~2) to the v143 flag table. The entry for `LinkControlFlowGuard` in `v143_Link.json` does not work when used in a `.vcxproj` file. Drop our link flag table entries for this toolset so that the flag will be passed via `AdditionalOptions`. Also add a test case. 12 January 2022, 21:45:07 UTC
67442ca Merge topic 'msvc-isystem' into release-3.22 3a8b6653dc MSVC: Use -external:I flag without space to support Clang tools Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6855 12 January 2022, 14:51:31 UTC
eb4e995 Merge topic 'file-READ_ELF-capture-error' into release-3.22 41bebbe50a file: Restore error capture in undocumented READ_ELF mode Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6853 12 January 2022, 14:45:06 UTC
3a8b665 MSVC: Use -external:I flag without space to support Clang tools Since commit f29e1874ad (Compiler/MSVC: use the `-external:I` flag for system includes, 2020-05-19, v3.22.0-rc1~593^2) we use the new flag followed by the include directory as a separate argument. Some versions of `clang-cl` and `clang-tidy` do not support the flag unless the include directory is attached to it, so use that form instead. Fixes: #22979 11 January 2022, 21:36:36 UTC
41bebbe file: Restore error capture in undocumented READ_ELF mode Revise the error message added by commit 115ff6a347 (cmELF: Include the ELF parsing code unconditionally, 2021-06-17, v3.22.0-rc1~557^2) to honor the `CAPTURE_ERROR` option. This is needed by the call site in `BundleUtilities` to suppress errors on non-ELF files. Fixes: #23074 11 January 2022, 17:46:06 UTC
4b8126f Merge topic 'armasm-6.17' into release-3.22 c2777ed008 ASM: Fix identification of armasm 6.17+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6833 07 January 2022, 14:40:14 UTC
c2777ed ASM: Fix identification of armasm 6.17+ Spelling of "ARM Compiler" changed to "Arm Compiler". 06 January 2022, 16:55:38 UTC
b00388a Merge topic 'ci-windows-no-java' into release-3.22 85a07b4b49 ci: Explicitly disable Java tests on VS builds Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6826 22 December 2021, 14:35:28 UTC
85a07b4 ci: Explicitly disable Java tests on VS builds Extend the change from commit 840fa28d3d (ci: Explicitly disable Java tests on Windows, 2021-12-16) to cover VS builds too. 22 December 2021, 14:09:08 UTC
a2752fd Merge topic 'FindBoost-1.78' into release-3.22 d45667d459 FindBoost: Do not warn about now-supported version 1.78 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6819 21 December 2021, 14:28:01 UTC
c74c8b5 Merge topic 'FindGLUT-include-dirs' into release-3.22 ae6b25d920 FindGLUT: Provide legacy GLUT_INCLUDE_DIR result in pkg-config code path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6814 20 December 2021, 14:30:00 UTC
d45667d FindBoost: Do not warn about now-supported version 1.78 In commit d176ff71c0 (FindBoost: Add support for Boost 1.78, 2021-12-15) we forgot to update the future-version check. Issue: #23016 20 December 2021, 14:03:54 UTC
ae6b25d FindGLUT: Provide legacy GLUT_INCLUDE_DIR result in pkg-config code path Since commit f90d15458a (FindGLUT: Use pkg-config to find flags if available, 2021-06-11, v3.22.0-rc1~469^2) we return early if pkg-config provides the information. During review of that commit, code to populate the legacy `GLUT_INCLUDE_DIR` result variable was removed from that code path. Add code to provide it. Also fix the test case to use `GLUT_INCLUDE_DIR`, the result variable documented officially by the module. Fixes: #23018 17 December 2021, 20:17:29 UTC
92ecf5c Merge topic 'FindBoost-python-3.10' into release-3.22 d4bb6c0c7f FindBoost: Add support for Python 3.10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6809 17 December 2021, 13:54:52 UTC
896abbb Merge branch 'release-3.21' into release-3.22 17 December 2021, 13:53:09 UTC
5cd7a6a Merge topic 'vs-intel-oneapi-toolset' into release-3.22 612c0d49f4 VS: Fix detecting icx.exe with Intel Compiler toolsets newer than 2021 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6806 17 December 2021, 13:52:02 UTC
d4bb6c0 FindBoost: Add support for Python 3.10 Regexps in FindBoost assumed that python's minor version had only one digit. That became not true for 3.10. Fixes: #23025 16 December 2021, 20:15:12 UTC
a1da2c3 Merge topic 'ci-windows-no-java' into release-3.22 840fa28d3d ci: Explicitly disable Java tests on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6807 16 December 2021, 16:08:40 UTC
840fa28 ci: Explicitly disable Java tests on Windows Avoid searching for a Java installation on Windows hosts. This will allow some CI hosts to have Java for other projects. We already do this on macOS. While at it, clarify the macOS setting. 16 December 2021, 16:03:30 UTC
cee2d5b Merge topic 'FindBoost-1.78' into release-3.22 d176ff71c0 FindBoost: Add support for Boost 1.78 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6804 16 December 2021, 15:25:53 UTC
b8e0b40 Merge branch 'vs-intel-oneapi-toolset' into release-3.21 Merge-request: !6806 15 December 2021, 20:58:43 UTC
612c0d4 VS: Fix detecting icx.exe with Intel Compiler toolsets newer than 2021 The logic added by commit 7808cbd644 (CMakeDetermineCompilerId: support Intel DPC++ compiler toolset for VS gen, 2020-12-06, v3.20.0-rc1~330^2) matches a specific toolset known to be the `icx.exe` compiler, and assumes all other Intel C++ compilers (that are not DPC++) must be `icl.exe`. Since `icx.exe` is officially replacing `icl.exe`, use a regex that matches the now-fixed set of toolsets known to use `icl.exe`. Any other Intel C++ compiler will be assumed to be `icx.exe`. Signed-off-by: William R. Dieter <william.r.dieter@intel.com> 15 December 2021, 20:56:20 UTC
d176ff7 FindBoost: Add support for Boost 1.78 Update the list of known versions. Run the command cmake -DBOOST_DIR=/path/to/boost_1_78_0 \ -P Utilities/Scripts/BoostScanDeps.cmake to extract dependencies from the 1.78.0 source tree. The dependencies differ from those of 1.77: * The `log` component no longer depends on `date_time`. Fixes: #23016 15 December 2021, 15:22:53 UTC
back to top