summaryrefslogtreecommitdiffstats
path: root/Source
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-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | 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
* 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
* Xcode: Implement Swift include directoriesBrad King2022-11-021-0/+3
| | | | | | | 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
* CMake 3.25.0-rc3v3.25.0-rc3Brad King2022-11-011-1/+1
|
* CMP0141: Fix PCH REUSE_FROM under policy NEW behaviorBrad King2022-10-311-6/+16
| | | | | | | | | | | 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
* 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 '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 'ninja-showIncludes-encoding' into release-3.25Brad King2022-10-315-34/+23
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-301-21/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Xcode: Put object files in a place that Xcode cleansBrad King2022-10-282-8/+25
|/ | | | | | | | | Since commit dc5fc898f6 (Xcode: Set object file locations using TARGET_TEMP_DIR, 2022-09-29, v3.25.0-rc1~64^2~1), `xcodebuild clean` does not remove the object files in our explicit `TARGET_TEMP_DIR` because it is not under the `SYMROOT`. Put it there. Fixes: #24096
* Merge topic 'vs-dotnet-sdk-output-paths' into release-3.25Brad King2022-10-281-1/+2
|\ | | | | | | | | | | | | d2d1be0671 VS: Fix paths in multi-target SDK-style projects Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7836
| * VS: Fix paths in multi-target SDK-style projectsSebastian Maisch2022-10-271-1/+2
| | | | | | | | | | | | | | | | | | | | Set the `AppendTargetFrameworkToOutputPath` property to `false` only for single target SDK-style projects. This prevents outputs from being overwritten during the build. This revises commit 7671d71299 (VS: Fix target output paths in SDK-style projects, 2022-09-23, v3.25.0-rc1~82^2). Fixes: #24094 Issue: #23989
* | Xcode: Revert "Don't set INSTALL_PATH unless target is SHARED_LIBRARY"Brad King2022-10-271-3/+3
|/ | | | | | | | | The change in commit 61acaa12af (xcode: Don't set INSTALL_PATH unless target is SHARED_LIBRARY, 2022-07-14, v3.25.0-rc1~291^2) breaks some existing use cases. Revert it pending further investigation. Fixes: #24087 Issue: #15183
* Merge topic 'cmake-presets-workflow-arguments' into release-3.25Brad King2022-10-273-12/+49
|\ | | | | | | | | | | | | | | | | | | | | 7ecbe324b0 cmake --workflow: add --fresh option 7d9aa0f00c cmake::Workflow: Refactor to use enum class argument 322193afcd cmake --workflow: print usage and exit on unrecognized argument 70aef29427 cmake --workflow: print usage message Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7825
| * cmake --workflow: add --fresh optionKyle Edwards2022-10-263-7/+25
| | | | | | | | Fixes: #24073
| * cmake::Workflow: Refactor to use enum class argumentKyle Edwards2022-10-263-7/+17
| |
| * cmake --workflow: print usage and exit on unrecognized argumentKyle Edwards2022-10-261-0/+2
| | | | | | | | Issue: #24073
| * cmake --workflow: print usage messageKyle Edwards2022-10-251-1/+8
| |
* | Merge topic 'xcode-swift-defs' into release-3.25Brad King2022-10-271-11/+32
|\ \ | | | | | | | | | | | | | | | | | | c0dd3dd2c1 Xcode: Evaluate Swift compile definitions separately Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7826
| * | Xcode: Evaluate Swift compile definitions separatelyBrad King2022-10-251-11/+32
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode has a separate setting for Swift compile definitions, so we can compute a dedicated value for it. Therefore we can: * Support the COMPILE_LANGUAGE generator expression for Swift-specific filters. * Avoid passing the `=value` part of definitions, which Swift does not support. This revises commit 5cb625eb2f (Xcode: Pass compile definitions to Swift, 2022-06-19, v3.25.0-rc1~493^2) and reverts commit 12c6fec6b4 (Xcode: Drop CMAKE_INTDIR= definition in Swift targets, 2022-09-30, v3.25.0-rc1~60^2~2), as the latter is no longer needed. Fixes: #24086
* | Merge topic 'cpack-trace-argument' into release-3.25Brad King2022-10-271-2/+2
|\ \ | | | | | | | | | | | | | | | | | | b5ebaa0d9c CPack: Require no argument for --trace and --trace-expand Acked-by: Kitware Robot <kwrobot@kitware.com> 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 topic 'vswhere-support-x86' into release-3.25Brad King2022-10-271-2/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 6eee8c9000 VS: Fix crash finding vswhere on 32-bit Windows Acked-by: Kitware Robot <kwrobot@kitware.com> 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 'filesystem-path-c++03-abi' into release-3.24Brad King2022-10-202-3/+12
| |\ \ | | | | | | | | | | | | Merge-request: !7813
| * \ \ Merge branch 'try_compile-CMP0128' into release-3.24Brad King2022-10-181-0/+6
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !7803
* | \ \ \ Merge topic 'ninja-intl-paths' into release-3.25Brad King2022-10-272-14/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | a12050666c Tests: Add case for ninja with non-ascii chars 02a04dd9c7 Ninja: Restore support for non-ascii paths on Windows with ninja<=1.10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7833
| * | | | 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 topic 'cmake-presets-list-workflow-type' into release-3.25Brad King2022-10-241-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 75cfbef780 cmake: Support --list-presets=workflow Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Tested-by: Craig Scott <craig.scott@crascit.com> Merge-request: !7816
| * | | | cmake: Support --list-presets=workflowKyle Edwards2022-10-211-0/+5
| | | | | | | | | | | | | | | | | | | | Fixes: #24072
* | | | | cmGlobalVisualStudioGenerator: Fix compiling as C++20 in VS 2022Werner, Joerg2022-10-211-1/+2
|/ / / / | | | | | | | | | | | | Adding missing narrow string conversion.
* | | | Merge topic 'filesystem-path-c++03-abi' into release-3.25Brad King2022-10-212-3/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | ee9805ccd1 cm/filesystem: Fix crash with pre-C++11 std::string GNU ABI in C++17 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7813
| * | | cm/filesystem: Fix crash with pre-C++11 std::string GNU ABI in C++17Brad King2022-10-202-3/+12
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | CMake 3.25.0-rc2v3.25.0-rc2Brad King2022-10-191-1/+1
| | |
* | | Merge topic 'cmake-presets-output-junit' into release-3.25Brad King2022-10-196-5/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bea4ed5430 CTest: Add support for outputJUnitFile in presets 9270a02003 CMakePresets.json: Add outputJUnitFile to test presets schema 757786bb73 Tests: Add test for outputLogFile in CMakePresets.json b68c3596e7 CMakePresets.json: Disallow extra properties in test output schema Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: scivision <michael@scivision.dev> Merge-request: !7806
| * | | CTest: Add support for outputJUnitFile in presetsKyle Edwards2022-10-182-5/+16
| | | | | | | | | | | | | | | | Fixes: #22400
| * | | CMakePresets.json: Add outputJUnitFile to test presets schemaKyle Edwards2022-10-184-0/+14
| | | |
* | | | Merge topic 'mingw-unc' into release-3.25Brad King2022-10-191-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9777e4c30e MinGW Makefiles: Quote UNC paths on command lines Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7802
| * | | | MinGW Makefiles: Quote UNC paths on command linesEd Hartley2022-10-181-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UNC paths (starting with `\\`) need quotes when generating MinGW Makefiles to avoid gmake interpreting the first `\` as an escape character. Fixes: #24061
* | | | | Merge topic 'try_compile-CMP0128' into release-3.25Brad King2022-10-191-0/+6
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | | | | | | | | | | | | 50e90e2828 try_compile: Honor CMP0128 setting in test project Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !7803
| * | | try_compile: Honor CMP0128 setting in test projectBrad King2022-10-181-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | CMake 3.23.4v3.23.4Brad King2022-10-041-1/+1
| | | |
* | | | Merge topic 'revert_nvcc_marking_include_as_system' into release-3.25Brad King2022-10-181-9/+0
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | d0e52219eb CUDA: Revert "Always mark cuda toolkit as system include" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7798
generated by cgit v0.12 at 2025-02-11 12:44:15 (GMT)