summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmState: Clarify name of member tracking the active scope in a directoryBrad King2022-11-073-17/+17
| | | | | | | | | | The `DirectoryEnd` member added by commit 52dbe654de (cmState: Record the end position of each directory., 2015-08-01, v3.4.0-rc1~251^2~1) actually tracks the current top-most scope in a directory's stack. This is evidenced by the use case in commit 3f4e5e8c3d (cmState: Return end snapshot for GetBuildsystemDirectoryParent., 2015-09-01, v3.4.0-rc1~100^2~1). Rename the member to `CurrentScope` to clarify this role.
* block: Fix variable scope protection from modification by subdirectoriesBrad King2022-11-075-2/+35
| | | | | | | | | | | | | | | | | | | | | | When `cmStateSnapshot::RaiseScope` raises a variable in to a parent directory scope, it uses `GetBuildsystemDirectoryParent` to find the current top-most scope on the directory's stack. Since commit 3f4e5e8c3d (cmState: Return end snapshot for GetBuildsystemDirectoryParent., 2015-09-01, v3.4.0-rc1~100^2~1), that depends on the `DirectoryEnd` field in the directory's state. However, when variable-only scopes were added by commit 6954c8936f (cmState: Add a VariableScope snapshot type., 2015-08-01, v3.4.0-rc1~179^2~1), we neglected to account for the addition of that field by commit 52dbe654de (cmState: Record the end position of each directory., 2015-08-01, v3.4.0-rc1~251^2~1). Prior to commit 44a2f3f332 (Add new flow-control commands for variables and policies scopes management, 2022-08-05, v3.25.0-rc1~257^2) this problem went unnoticed because there was no way to have a variable scope at the top of a directory's stack while processing a subdirectory. Now the `block()/endblock()` commands enable the behavior, so fix tracking of a variable scope as the top-most scope in a directory. Fixes: #24138
* Merge topic 'tasking-pic' into release-3.25Brad King2022-11-041-1/+1
|\ | | | | | | | | | | | | | | 7e612977b9 Tasking: Fix PIC option for Tasking Toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Christoph Seitz <christoph.seitz@posteo.de> Merge-request: !7862
| * Tasking: Fix PIC option for Tasking ToolsetGordon Jess2022-11-031-1/+1
| | | | | | | | Fixes: #24114
* | Merge topic 'vs-default-toolset' into release-3.25Brad King2022-11-041-18/+20
|\ \ | | | | | | | | | | | | | | | | | | c50df859c5 VS: Restore support for two-part default toolset version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7864
| * | VS: Restore support for two-part default toolset versionBrad King2022-11-031-18/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit f972e4fd3a (cmVSGenerator: Add support for two-part toolset versions for Visual Studio, 2022-09-01, v3.25.0-rc1~180^2), if a two-part toolset version is requested, we fail early if globbing finds no auxiliary toolsets with that version. This broke our existing support for detecting when the default toolset matches the two-part version requested. Fix the logic to ignore the two-part globbing results if they are empty so we fall through to checking the default version. Fixes: #24107
* | | Merge branch 'release-3.24' into release-3.25Brad King2022-11-040-0/+0
|\ \ \
| * \ \ Merge branch 'ci-xcode-14.1' into release-3.24Brad King2022-11-0310-29/+37
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !7863
* | \ \ \ Merge topic 'ci-xcode-14.1' into release-3.25Brad King2022-11-041-6/+6
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | | | | | | | | | | | | | | | | | 0d3d687067 gitlab-ci: update macOS jobs to use Xcode 14.1 9684a589ca Source: Replace uses of sprintf with safer snprintf in CMake 3.24 branch eea23d21a3 Source: Tell Git not to check whitespace in third-party curses form code Acked-by: Kitware Robot <kwrobot@kitware.com> 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
| |/ /
* | | Merge topic 'ci-swift-5.7' into release-3.25Brad King2022-11-031-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 48ea2ce504 ci: Update debian10-ninja job to use Swift 5.7.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7860
| * | | ci: Update debian10-ninja job to use Swift 5.7.1Brad King2022-11-021-4/+4
| | | |
* | | | Merge topic 'correct_nvptxcompiler_not_linking_to_threads' into release-3.25Brad King2022-11-035-2/+37
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 62f13ed588 FindCUDAToolkit: Restore usage from multiple directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7859
| * | | | FindCUDAToolkit: Restore usage from multiple directoriesRobert Maynard2022-11-025-2/+37
| | | | | | | | | | | | | | | | | | | | Fixes #24119
* | | | | Merge topic 'xcode-swift-include-dirs' into release-3.25Brad King2022-11-036-10/+23
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb4e6702b2 Xcode: Implement Swift include directories e1ccab12d7 Xcode: Restore Swift framework search directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7858
| * | | | Xcode: Implement Swift include directoriesBrad King2022-11-026-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Populate Xcode's `SWIFT_INCLUDE_PATHS` build setting with the target-wide include directories. Issue: #24116
| * | | | Xcode: Restore Swift framework search directoriesBrad King2022-11-021-10/+12
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we selected a single "language for preprocessor" with which to compute both target-wide `GCC_PREPROCESSOR_DEFINITIONS` and `{HEADER,FRAMEWORK}_SEARCH_PATHS`. Since commit c0dd3dd2c1 (Xcode: Evaluate Swift compile definitions separately, 2022-10-25, v3.25.0-rc3~16^2) we never compute `GCC_PREPROCESSOR_DEFINITIONS` for Swift. Therefore we need to select the language for target-wide include and framework directories separately. Fixes: #24116
* | | | Merge topic 'IAR-CXX-fix' into release-3.25Brad King2022-11-021-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 73e84a392b IAR: Restore support for CMAKE_CXX_FLAGS_INIT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7857
| * | | IAR: Restore support for CMAKE_CXX_FLAGS_INITDaniel Schürmann2022-11-011-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to commit a9073db736 (IAR: update language specification detection, 2021-09-23, v3.22.0-rc1~83^2) the `--c++`/`--eec++` flags were stored in `CMAKE_IAR_CXX_FLAG` so that they would be used as part of the `CMAKE_CXX_COMPILE_OBJECT` rule variable. That commit moved the flags to `CMAKE_CXX_FLAGS`, which also broke initialization of `CMAKE_CXX_FLAGS` from `CMAKE_CXX_FLAGS_INIT`. Restore the original approach. Fixes: #24111
* | | CMake 3.25.0-rc3v3.25.0-rc3Brad King2022-11-011-1/+1
| | |
* | | Merge branch 'release-3.24' into release-3.25Brad King2022-11-011-0/+11
|\ \ \ | | |/ | |/|
| * | CMake 3.24.3v3.24.3Brad King2022-11-012-1/+12
| | |
* | | Merge branch 'release-3.24' into release-3.25Brad King2022-11-011-2/+2
|\ \ \ | |/ /
| * | 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 topic 'update-curl' into release-3.25Brad King2022-11-01350-4296/+8265
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25e9f31878 curl: Set build options the way we need for CMake 9ffe6b0969 Merge branch 'upstream-curl' into update-curl ec122fff08 curl 2022-10-26 (cd95ee9f) fa9bbb8627 curl: Update script to get curl 7.86.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7851
| * | | | curl: Set build options the way we need for CMakeBrad King2022-10-312-0/+18
| | | | |
| * | | | Merge branch 'upstream-curl' into update-curlBrad King2022-10-31348-4295/+8246
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2022-10-26 (cd95ee9f)
| | * | | | curl 2022-10-26 (cd95ee9f)Curl Upstream2022-10-31348-4285/+8247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit cd95ee9f771361acf241629d2fe5507e308082a2 (curl-7_86_0).
| * | | | | curl: Update script to get curl 7.86.0Brad King2022-10-311-1/+1
| | | | | |
* | | | | | Merge topic 'cmp0141-pch-reuse' into release-3.25Brad King2022-11-0118-54/+72
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 183b9a9eca CMP0141: Fix PCH REUSE_FROM under policy NEW behavior 4d13f472a2 Tests: Drop redundant project init from RunCMake.PrecompileHeaders cases 2e65fe92db cmLocalGenerator: Clarify name of local PDB type variable 17096aeba8 cmLocalGenerator: Factor out helper to compute MSVC_DEBUG_INFORMATION_FORMAT Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7854
| * | | | | | CMP0141: Fix PCH REUSE_FROM under policy NEW behaviorBrad King2022-10-315-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under the CMP0141 NEW behavior added by commit 0e96a20478 (MSVC: Add abstraction for debug information format, 2022-08-25, v3.25.0-rc1~142^2~1), the `-Zi` and `-ZI` flags do not appear in `CMAKE_<LANG>_FLAGS_<CONFIG>` anymore. Teach the PCH REUSE_FROM implementation to recognize the `EditAndContinue` and `ProgramDatabase` debug information formats through the policy's new abstraction. Fixes: #24106
| * | | | | | Tests: Drop redundant project init from RunCMake.PrecompileHeaders casesBrad King2022-10-3113-29/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `CMakeLists.txt` file already calls `cmake_minimum_required` and `project` before including each case's code.
| * | | | | | cmLocalGenerator: Clarify name of local PDB type variableBrad King2022-10-311-3/+2
| | | | | | |
| * | | | | | cmLocalGenerator: Factor out helper to compute MSVC_DEBUG_INFORMATION_FORMATBrad King2022-10-312-16/+30
| |/ / / / /
* | | | | | Merge topic 'FindCUDAToolkit-nvptxcompiler-static-deps' into release-3.25Brad King2022-11-011-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | | | | | | | | | | | 301815eb62 FindCUDAToolkit: Add nvptxcompiler_static dependency on Threads::Threads Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7853
| * | | | FindCUDAToolkit: Add nvptxcompiler_static dependency on Threads::ThreadsRobert Maynard2022-10-311-1/+2
|/ / / /
* | | | Merge topic 'file-download-log-with-hash' into release-3.25Brad King2022-10-311-5/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d78671879b file(DOWNLOAD): Fix LOG with EXPECTED_HASH on download failure Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7848
| * | | | file(DOWNLOAD): Fix LOG with EXPECTED_HASH on download failureAurelien Regat-Barrel2022-10-301-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `file(DOWNLOAD <url> EXPECTED_HASH <hash> LOG <logs>)` fails to download the requested file, the hash check will also fail and make the command exit without actually returning the curl logs as requested by the `LOG` argument. Report the log before checking the hash. Issue: #24093
* | | | | Merge topic 'ArchLinux-lib-dir' into release-3.25Brad King2022-10-311-3/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 988b9928e4 Linux: Avoid finding libraries using lib64 on ArchLinux Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Felix Yan <felixonmars@archlinux.org> Merge-request: !7849
| * | | | | Linux: Avoid finding libraries using lib64 on ArchLinuxLetu Ren2022-10-301-3/+8
| |/ / / / | | | | | | | | | | | | | | | | | | | | ArchLinux uses `/lib` for 64-bit libraries and there is no `/lib64`. However, unlike Debian, 32-bit libraries are in `/lib32`.
* | | | | Merge topic 'vs-dotnetsdk-arm64' into release-3.25Brad King2022-10-311-2/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a0ca7df67 Tests: Fix RunCMake.VsDotnetSdk with VS >= 17.3 on ARM64 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7842
| * | | | | Tests: Fix RunCMake.VsDotnetSdk with VS >= 17.3 on ARM64Anthony Roberts2022-10-281-2/+8
| |/ / / / | | | | | | | | | | | | | | | | | | | | VS 17.3 provides an arm64-native version of the tool, but the test was looking for the x64 version.
* | | | | Merge topic 'ninja-showIncludes-encoding' into release-3.25Brad King2022-10-3118-35/+128
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a0d4e3bf34 cmGeneratedFileStream: Drop unused WriteRaw method 2e5af30ce0 Ninja: Match showIncludes dependencies using console output code page e1c1679148 cm_codecvt: Add support for the Windows console output code page 328c15189d cmGeneratedFileStream: Add support for a temporary alternate encoding Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7845
| * | | | | cmGeneratedFileStream: Drop unused WriteRaw methodBrad King2022-10-302-23/+1
| | | | | | | | | | | | | | | | | | | | | | | | It has been superseded by `WriteAltEncoding`.
| * | | | | Ninja: Match showIncludes dependencies using console output code pageBrad King2022-10-3014-22/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generalize the fix from commit 37a279f8d1 (Ninja: Write msvc_deps_prefix as UTF-8 when console codepage is UTF-8, 2020-07-31, v3.19.0-rc1~349^2). `cl /showIncludes` output is encoded using the console output code page, so this is the byte sequence that Ninja must use to match its lines. Fixes: #24068
| * | | | | cm_codecvt: Add support for the Windows console output code pageBrad King2022-10-292-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | This is distinct from the Windows ANSI code page.
| * | | | | cmGeneratedFileStream: Add support for a temporary alternate encodingBrad King2022-10-292-0/+20
| |/ / / / | | | | | | | | | | | | | | | | | | | | The Ninja generator needs to be able to write some file content in a different encoding than the rest of the file. Add a method to do this.
generated by cgit v0.12 at 2025-09-04 18:02:16 (GMT)