summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.24.4v3.24.4Brad King2023-03-082-1/+8
|
* Merge branch 'backport-3.24-file-install-macos' into release-3.24Brad King2023-03-081-0/+6
|\ | | | | | | Merge-request: !8293
| * file(INSTALL): Fix file ownership regression when running as root on macOSBrad King2023-03-071-0/+6
|/ | | | | | | Backport KWSys commit `51272e80e` (SystemTools: Avoid macOS copyfile semantic differences as root, 2023-03-07). Fixes: #24577
* Merge branch 'release-3.23' into release-3.24Brad King2023-03-030-0/+0
|\
| * Merge branch 'GoogleTest-type-param-suite' into release-3.23Brad King2023-03-036-4/+68
| |\ | | | | | | | | | Merge-request: !8282
* | \ Merge branch 'GoogleTest-type-param-suite' into release-3.24Brad King2023-03-036-4/+68
|\ \ \ | | |/ | |/| | | | Merge-request: !8282
| * | GoogleTest: Restore suite name for type-parametrized testsBrad King2023-03-036-4/+68
| |/ | | | | | | | | | | | | | | Fix a regression from commit 073dd1bd81 (GoogleTest: Change format for typed tests, 2022-02-07, v3.23.0-rc1~4^2) in the suite name detection. Co-authored-by: Evgeniy Shcherbina <ixsci@pm.me> Fixes: #24563
* | Merge branch 'doc-header-only' into release-3.24Brad King2023-01-131-1/+1
|\ \ | | | | | | | | | Merge-request: !8071
| * | Help: Restore cmake-buildsystem(7) header-only library exampleBrad King2023-01-131-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | Since commit 4391913133 (Add INTERFACE libraries to generated buildsystem if they have SOURCES, 2020-07-20, v3.19.0-rc1~346^2~1) the "Eigen" example in the `cmake-buildsystem(7)` manual is supposed to show a header-only library in which the headers are attached as sources to be edited in IDEs. This was accidentally broken by commit 4b25a0d512 (Help/manual: Update header-only library example, 2022-04-22, v3.24.0-rc1~220^2) when updating the example to use a `FILE_SET`. Fixes: #24319
* | Merge branch 'release-3.23' into release-3.24Brad King2023-01-120-0/+0
|\ \ | |/
| * Merge branch 'backport-IntelLLVM-no-icpx-on-Windows' into release-3.23Brad King2023-01-121-1/+7
| |\ | | | | | | | | | Merge-request: !8041
* | \ Merge branch 'backport-IntelLLVM-no-icpx-on-Windows' into release-3.24Brad King2023-01-121-1/+7
|\ \ \ | | |/ | |/| | | | Merge-request: !8041
| * | IntelLLVM: Avoid finding not-yet-supported icpx on WindowsMichael Hirsch2023-01-121-1/+7
| |/ | | | | | | | | | | | | | | | | | | Intel oneAPI 2023.0 added the `icpx` compiler front-end on Windows. It uses a GNU-like command-line, and is not yet supported by CMake. Avoid finding `icpx` as the CXX compiler on Windows until support is added. Fixes: #24266 Issue: #24314
* | 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-282-7/+11
|\ \ | | | | | | | | | Merge-request: !7964
| * | MinGW: Fix regression when windres is not foundBrad King2022-11-282-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
View Lorry Controller Status