summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* IAR/CXX: Fix compatibility with CMP0057 OLDRaul Tambre2022-01-291-3/+6
| | | | | | | | | | 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.
* Merge branch 'release-3.21' into release-3.22Brad King2022-01-280-0/+0
|\
| * Merge branch 'message-flush' into release-3.21Brad King2022-01-271-2/+2
| |\ | | | | | | | | | Merge-request: !6913
* | \ Merge topic 'message-flush' into release-3.22Brad King2022-01-281-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 634587e322 message: Restore explicit flushing of messages on stderr Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6913
| * | message: Restore explicit flushing of messages on stderrBrad King2022-01-271-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'release-3.21' into release-3.22Brad King2022-01-270-0/+0
|\ \ | |/
| * Merge branch 'FindThreads-libc-pthread-flag' into release-3.21Brad King2022-01-261-8/+11
| |\ | | | | | | | | | Merge-request: !6906
| * \ Merge branch 'nmake-rsp-encoding' into release-3.21Brad King2022-01-261-2/+15
| |\ \ | | | | | | | | | | | | Merge-request: !6905
* | \ \ Merge topic 'nmake-rsp-encoding' into release-3.22Brad King2022-01-271-2/+15
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | NMake: Use UTF-8 BOM in response files only with MSVC toolingBrad King2022-01-261-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | NMake: Document response file encoding heuristic in a commentBrad King2022-01-261-2/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge topic 'FindThreads-libc-pthread-flag' into release-3.22Brad King2022-01-271-8/+11
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 5efb6fb516 FindThreads: Honor THREADS_PREFER_PTHREAD_FLAG when pthread is found in libc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6906
| * | FindThreads: Honor THREADS_PREFER_PTHREAD_FLAG when pthread is found in libcMattias Ellert2022-01-261-8/+11
| |/ | | | | | | | | | | | | | | 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.
* | Merge topic 'FindMPI-static-first' into release-3.22Brad King2022-01-261-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 036d0cbbde FindMPI: Place static first in mpi test source Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6900
| * | FindMPI: Place static first in mpi test sourceBrad King2022-01-251-1/+1
|/ / | | | | | | | | | | | | | | 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
* | CMake 3.22.2v3.22.2Brad King2022-01-251-1/+1
| |
* | Merge topic 'doc-3.22-patches' into release-3.22Brad King2022-01-251-0/+7
|\ \ | | | | | | | | | | | | | | | | | | 1461eff899 Help: Add missing 3.22.1 section to the release notes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6895
| * | Help: Add missing 3.22.1 section to the release notesBrad King2022-01-241-0/+7
| | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'release-3.21' into release-3.22Brad King2022-01-250-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'ci-xcode-13.2' into release-3.21Brad King2022-01-251-6/+6
| |\ \ | | | | | | | | | | | | Merge-request: !6897
* | \ \ Merge topic 'ci-xcode-13.2' into release-3.22Brad King2022-01-251-6/+6
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | | | | | | 8cb32fc8ad gitlab-ci: update macOS jobs to use Xcode 13.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6897
| * | gitlab-ci: update macOS jobs to use Xcode 13.2Brad King2022-01-251-6/+6
| |/
* | Merge topic 'cmp0128_cuda' into release-3.22Brad King2022-01-2418-35/+57
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | CMP0128: Add flag in OLD mode even when standard matches the defaultRaul Tambre2022-01-235-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | CMP0128: Avoid test code duplicationRaul Tambre2022-01-237-26/+10
| | |
| * | CMP0128: Prefix test names with modeRaul Tambre2022-01-237-7/+7
| | | | | | | | | | | | Makes clear that these tests are for the NEW behaviour.
| * | XL: Detect default extensions mode for legacy compilerRaul Tambre2022-01-232-2/+2
|/ / | | | | | | | | The legacy non-Clang variant seems to support a GNU-like extensions mode, which is the default. Enable detection for it.
* | Merge topic 'FortranCInterface-gcc-12-lto' into release-3.22Brad King2022-01-201-0/+13
|\ \ | | | | | | | | | | | | | | | | | | 6a0ce19ce1 FortranCInterface: Fix compatibility with GCC gfortran 12 LTO Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6879
| * | FortranCInterface: Fix compatibility with GCC gfortran 12 LTOBjörn Esser2022-01-191-0/+13
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'release-3.21' into release-3.22Brad King2022-01-130-0/+0
|\ \ | |/
| * Merge branch 'vs2022-v143-link-guard-cf' into release-3.21Brad King2022-01-124-7/+48
| |\ | | | | | | | | | Merge-request: !6858
* | \ Merge topic 'vs2022-v143-link-guard-cf' into release-3.22Brad King2022-01-134-7/+48
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 9e24437c91 VS: Remove the '/guard:cf' flag from v143 link flag table Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6858
| * | VS: Remove the '/guard:cf' flag from v143 link flag tableBenjamin Sluis2022-01-124-7/+48
| |/ | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge topic 'msvc-isystem' into release-3.22Brad King2022-01-122-2/+2
|\ \ | | | | | | | | | | | | | | | | | | 3a8b6653dc MSVC: Use -external:I flag without space to support Clang tools Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6855
| * | MSVC: Use -external:I flag without space to support Clang toolsBrad King2022-01-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge topic 'file-READ_ELF-capture-error' into release-3.22Brad King2022-01-123-5/+29
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 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
| * | file: Restore error capture in undocumented READ_ELF modeBrad King2022-01-113-5/+29
|/ / | | | | | | | | | | | | | | | | 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
* | Merge topic 'armasm-6.17' into release-3.22Brad King2022-01-071-1/+1
|\ \ | | | | | | | | | | | | | | | | | | c2777ed008 ASM: Fix identification of armasm 6.17+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6833
| * | ASM: Fix identification of armasm 6.17+Jukka Jalkanen2022-01-061-1/+1
|/ / | | | | | | Spelling of "ARM Compiler" changed to "Arm Compiler".
* | Merge topic 'ci-windows-no-java' into release-3.22Brad King2021-12-221-0/+1
|\ \ | | | | | | | | | | | | | | | | | | 85a07b4b49 ci: Explicitly disable Java tests on VS builds Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6826
| * | ci: Explicitly disable Java tests on VS buildsBrad King2021-12-221-0/+1
|/ / | | | | | | | | Extend the change from commit 840fa28d3d (ci: Explicitly disable Java tests on Windows, 2021-12-16) to cover VS builds too.
* | Merge topic 'FindBoost-1.78' into release-3.22Brad King2021-12-211-1/+1
|\ \ | | | | | | | | | | | | | | | | | | d45667d459 FindBoost: Do not warn about now-supported version 1.78 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6819
| * | FindBoost: Do not warn about now-supported version 1.78Brad King2021-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | | In commit d176ff71c0 (FindBoost: Add support for Boost 1.78, 2021-12-15) we forgot to update the future-version check. Issue: #23016
* | | Merge topic 'FindGLUT-include-dirs' into release-3.22Brad King2021-12-202-1/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | ae6b25d920 FindGLUT: Provide legacy GLUT_INCLUDE_DIR result in pkg-config code path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6814
| * | FindGLUT: Provide legacy GLUT_INCLUDE_DIR result in pkg-config code pathBrad King2021-12-172-1/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge topic 'FindBoost-python-3.10' into release-3.22Brad King2021-12-171-6/+6
|\ \ | | | | | | | | | | | | | | | | | | d4bb6c0c7f FindBoost: Add support for Python 3.10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6809
| * | FindBoost: Add support for Python 3.10Oleg Sidorkin2021-12-161-6/+6
| | | | | | | | | | | | | | | | | | | | | Regexps in FindBoost assumed that python's minor version had only one digit. That became not true for 3.10. Fixes: #23025
* | | Merge branch 'release-3.21' into release-3.22Brad King2021-12-170-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'vs-intel-oneapi-toolset' into release-3.21Brad King2021-12-151-5/+3
| |\ \ | | | | | | | | | | | | Merge-request: !6806
* | \ \ Merge topic 'vs-intel-oneapi-toolset' into release-3.22Brad King2021-12-171-5/+3
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | | | | | | 612c0d49f4 VS: Fix detecting icx.exe with Intel Compiler toolsets newer than 2021 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6806
generated by cgit v0.12 at 2025-02-05 06:05:41 (GMT)