summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix-cmzlib-crc32-fn-mangling' into release-3.24Brad King2023-01-121-2/+1
|\ | | | | | | Merge-request: !8049
| * zlib: Fix typo in mangling the crc32() functionleha-bot2023-01-111-2/+1
|/ | | | | | | | Fix the mangling of `crc32` by commit 29c578c8fb (zlib: Mangle symbols to avoid conflict with external transitive dependencies, 2022-06-10, v3.24.0-rc1~7^2). Fixes: #24281
* Merge branch 'test-git-local-defaultBranch' into release-3.24Brad King2023-01-111-1/+1
|\ | | | | | | Merge-request: !8060
| * Tests: Fix CTest.UpdateGIT under repo-local defaultBranch configBrad King2023-01-111-1/+1
| | | | | | | | | | | | | | | | | | The default branch detection added by commit 26ec2e2b0c (Tests: Update CTest.UpdateGIT test for custom defaultBranch, 2020-12-02, v3.20.0-rc1~355^2) fails if the test is run inside a Git work tree whose `.git` directory configures a `defaultBranch` that is different from the global or system-wide value. Fix the detection to ignore the locally configured value so that we match the `git init` decision.
* | Merge branch 'ci-xcode-14.2' into release-3.24Brad King2022-12-161-6/+6
|\ \ | |/ |/| | | Merge-request: !8023
| * gitlab-ci: update macOS jobs to use Xcode 14.2Brad King2022-12-151-6/+6
|/
* Merge branch 'rel-win-sign-digest' into release-3.24Brad King2022-11-301-1/+1
|\ | | | | | | Merge-request: !7970
| * Utilities/Release: Use explicit digest for Win7-compatible signatureBrad King2022-11-301-1/+1
|/ | | | Otherwise `signtool` warns.
* Merge branch 'mingw-windres' into release-3.24Brad King2022-11-292-7/+11
|\ | | | | | | Merge-request: !7964
| * MinGW: Fix regression when windres is not foundBrad King2022-11-292-7/+11
|/ | | | | | | | | | | | The fix in commit e9755bc7c1 (MinGW: Restore using windres when toolchain-prefixed name is not available, 2022-08-15, v3.24.1~4^2) incorrectly listed two entries in `CMAKE_RC_COMPILER_INIT`, which is only meant to have one value. Revise the logic to support multiple platform-specific names for the Windows Resource Compiler while still only using one name as the fallback when it is not found. Fixes: #24190 Issue: #23841
* Merge branch 'test-FindBoost-python-versions' into release-3.24Brad King2022-11-171-2/+2
|\ | | | | | | Merge-request: !7929
| * Tests: Update FindBoost.TestPython for Python 3.11 and 3.12Brad King2022-11-161-2/+2
|/ | | | | | | | | | | Follow up the python 3.11 and 3.12 support from: * commit 43844c5d82 (FindPython: Add support for Python 3.11, 2021-12-07, v3.22.2~20^2) * commit ca2877c039 (FindPython: add support for Python 3.12, 2022-05-11, v3.23.2~15^2) with an update for the FindBoost test.
* Merge branch 'release-3.23' into release-3.24Brad King2022-11-140-0/+0
|\
| * Merge branch 'compile-msvc-14.34-c++20' into release-3.23Brad King2022-11-141-1/+2
| |\ | | | | | | | | | Merge-request: !7910
* | \ Merge branch 'compile-msvc-14.34-c++20' into release-3.24Brad King2022-11-141-1/+2
|\ \ \ | | |/ | |/| | | | Merge-request: !7910
| * | cmGlobalVisualStudioGenerator: Fix compiling as C++20 in VS 2022Werner, Joerg2022-11-141-1/+2
| |/ | | | | | | | | | | | | | | | | | | Adding missing narrow string conversion. This backports commit f3c918ef1b (cmGlobalVisualStudioGenerator: Fix compiling as C++20 in VS 2022, 2022-10-20, v3.25.0-rc3~31^2) to the CMake 3.23 and 3.24 branches. Fixes: #24162
* | Merge branch 'expat-c-no-extensions' into release-3.24Brad King2022-11-101-0/+6
|\ \ | | | | | | | | | Merge-request: !7899
| * | expat: Activate POSIX APIs even without compiler extensionsRaul Tambre2022-11-101-0/+6
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compile with the preprocessor definitions necessary for the `arc4random` family so it's available even when compiler extensions are not enabled. Similar things are done in cmbzip2, cmcurl, cmlibarchive, cmliblizma and cmlibuv. This issue surfaced on a nightly bot after glibc 2.36 added arc4random functions. cmlibarchive defines the necessary macro, but also relies on `HAVE_ARC4RANDOM_BUF`. cmlibarchive's check with the necessary macro defined was skipped due to cmexpat running the same check before, but without the macros, and it being cached. This extends commit c7c3e39e4f (Utilities: Activate POSIX APIs even without compiler extensions, 2022-06-02, v3.24.0-rc1~34^2) to cover our build of expat too. Issue: #20454
* | Merge branch 'ci-xcode-14.1' into release-3.24Brad King2022-11-0310-29/+37
|\ \ | | | | | | | | | Merge-request: !7863
| * | gitlab-ci: update macOS jobs to use Xcode 14.1Brad King2022-11-031-6/+6
| | |
| * | Source: Replace uses of sprintf with safer snprintf in CMake 3.24 branchSean McBride2022-11-038-23/+30
| | | | | | | | | | | | | | | | | | Backport commit d5694e4623 (Source: Replace uses of sprintf with safer snprintf, 2022-06-17, v3.25.0-rc1~587^2) to the CMake 3.24 branch. This is needed to compile without warnings using Xcode 14.1's macOS 13.0 SDK.
| * | Source: Tell Git not to check whitespace in third-party curses form codeBrad King2022-11-031-0/+1
|/ /
* | CMake 3.24.3v3.24.3Brad King2022-11-012-1/+12
| |
* | Merge branch 'release-3.23' into release-3.24Brad King2022-11-011-2/+2
|\ \ | |/
| * CMake 3.23.5v3.23.5Brad King2022-11-012-3/+3
| |
* | Merge branch 'cpack-trace-argument' into release-3.24Brad King2022-10-271-2/+2
|\ \ | | | | | | | | | Merge-request: !7824
| * | CPack: Require no argument for --trace and --trace-expandKyle Edwards2022-10-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This was accidentally broken by commit 87c762d435 (CPack: Use cmCommandLineArgument instead of cmsys::CommandLineArguments, 2022-04-18, v3.24.0-rc1~258^2). Fixes: #24085
* | | Merge branch 'vswhere-support-x86' into release-3.24Brad King2022-10-271-2/+21
|\ \ \ | | | | | | | | | | | | Merge-request: !7832
| * | | VS: Fix crash finding vswhere on 32-bit WindowsBrad King2022-10-261-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit f85913fa08 (VS: Add support for enumerating VS instances with vswhere, 2022-04-11, v3.24.0-rc1~282^2), if the COM lookup does not report any VS instances, we fall back to finding vswhere. However, the `getenv` call returns nullptr if the `ProgramFiles(x86)` environment variable is not set. Update the logic to tolerate not-set environment variables. Also check the plain `ProgramFiles` environment variable. Fixes: #24090
* | | | Merge branch 'release-3.23' into release-3.24Brad King2022-10-270-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'ninja-intl-paths' into release-3.23Brad King2022-10-276-14/+22
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !7833
* | \ \ \ Merge branch 'ninja-intl-paths' into release-3.24Brad King2022-10-276-14/+22
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | Merge-request: !7833
| * | | Tests: Add case for ninja with non-ascii charsBrad King2022-10-264-0/+22
| | | | | | | | | | | | | | | | Issue: #24089
| * | | Ninja: Restore support for non-ascii paths on Windows with ninja<=1.10Brad King2022-10-262-14/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | Revert commit bbdb000c55 (GlobalNinjaGenerator: enlarge file stream buffer, 2022-01-25, v3.23.0-rc1~68^2). Somehow `rdbuf()->pubsetbuf()` is resetting our imbued locale and `cm_codecvt` that handles encoding. Fixes: #24089
* | | Merge branch 'release-3.23' into release-3.24Brad King2022-10-250-0/+0
|\ \ \ | |/ /
| * | Merge branch 'try_compile-CMP0128' into release-3.23Brad King2022-10-241-4/+5
| |\ \ | | | | | | | | | | | | Merge-request: !7821
* | \ \ Merge branch 'try_compile-CMP0128' into release-3.24Brad King2022-10-251-4/+5
|\ \ \ \ | | |/ / | |/| | | | | | Merge-request: !7821
| * | | Tests: Avoid running C++11 test on GNU < 4.7Brad King2022-10-241-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | The test added in commit 50e90e2828 (try_compile: Honor CMP0128 setting in test project, 2022-10-18, v3.25.0-rc2~4^2) requires that the compiler support C++11 mode, so do not run it on GNU compilers that are too old.
* | | | Merge branch 'flang-windows' into release-3.24Brad King2022-10-241-0/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | Merge-request: !7818
| * | | LLVMFlang: Add a required line to define linking rules on Windowsمهدي شينون (Mehdi Chinoune)2022-10-241-0/+1
|/ / / | | | | | | | | | | | | This was missed in commit d34e5a98b8 (LLVMFlang: Add support for Windows, 2022-09-18, v3.25.0-rc1~102^2).
* | | Merge branch 'release-3.23' into release-3.24Brad King2022-10-210-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'filesystem-path-c++03-abi' into release-3.23Brad King2022-10-203-13/+18
| |\ \ | | | | | | | | | | | | Merge-request: !7813
* | \ \ Merge branch 'filesystem-path-c++03-abi' into release-3.24Brad King2022-10-203-13/+18
|\ \ \ \ | | |/ / | |/| | | | | | Merge-request: !7813
| * | | cm/filesystem: Fix crash with pre-C++11 std::string GNU ABI in C++17Brad King2022-10-203-13/+18
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `remove_filename` and `replace_extension` methods compute an offset between the whole path in a `std::string` and a part of a path in a `std::string_view`. This is done by subtracting their `.data()` pointers. However, C++17 adds a non-const `.data()` through which modification of the string is allowed. This means the copy-on-write implementation used by the pre-C++11 std::string GNU ABI must reallocate if the string has been copied. Our subtraction then computes an offset between two different allocations, which is undefined behavior. The workaround in commit b3ca4f9ad1 (cm/filesystem: Work around crash when compiled for CYGWIN/MSYS runtime, 2021-04-22, v3.21.0-rc1~271^2~2) avoided the problem by calling the non-const `.data()` to reallocate before constructing the `string_view`. Instead, explicitly call the const `.data()` method on the string, which does not reallocate. Fixes: #22090, #23328
* | | Merge branch 'test-git-protocol-file' into release-3.24Brad King2022-10-201-0/+2
|\ \ \ | | | | | | | | | | | | Merge-request: !7812
| * | | Tests: Explicitly allow usage of git file-based protocol in test casesBrad King2022-10-201-0/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Due to CVE-2022-39253, Git 2.30.6 sets `protocol.file.allow=user` by default. The change has also been backported to other Git versions by distros. This breaks some of our test cases that use the file-based protocol locally to simulate real workflows without requiring network access. In these cases the file protocol is safe, so explicitly enable it in the tests.
* | | Merge branch 'release-3.23' into release-3.24Brad King2022-10-190-0/+0
|\ \ \ | |/ /
| * | Merge branch 'try_compile-CMP0128' into release-3.23Brad King2022-10-186-0/+72
| |\ \ | | |/ | | | | | | Merge-request: !7803
* | | Merge branch 'try_compile-CMP0128' into release-3.24Brad King2022-10-186-0/+72
|\ \ \ | | |/ | |/| | | | Merge-request: !7803
| * | try_compile: Honor CMP0128 setting in test projectBrad King2022-10-186-0/+72
| |/ | | | | | | | | | | | | | | | | Some projects pass a raw `-std=` flag to the compiler in the `try_compile` project. If they do not set CMP0128 to NEW, we should not append a `-std=` flag where we did not before the policy was added. Fixes: #24063
generated by cgit v0.12 at 2025-02-04 04:59:43 (GMT)