summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | CUDA: Revert "Always mark cuda toolkit as system include"Robert Maynard2022-10-171-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to revert this change as it can disable error messages when compiling invalid CUDA code. This reverts commit ea659b155d (CUDA: Always mark cuda toolkit as system include, 2022-06-27, v3.25.0-rc1~269^2).
* | | | Xcode: ensure framework with custom output directory can be consumedMarc Chevrier2022-10-141-5/+13
|/ / / | | | | | | | | | Fixes: #24046
* | | CMake 3.25.0-rc1v3.25.0-rc1Brad King2022-10-121-1/+1
| | |
* | | Begin 3.25 release versioningBrad King2022-10-111-3/+3
| | |
* | | CMake Nightly Date StampKitware Robot2022-10-111-1/+1
| | |
* | | Merge topic 'verify-header-sets-iwyu'Brad King2022-10-101-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6942234bf5 VERIFY_INTERFACE_HEADER_SETS: Add IWYU pragma: associated to verification file Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7762
| * | | VERIFY_INTERFACE_HEADER_SETS: Add IWYU pragma: associated to verification fileDaniel Hannon2022-10-071-1/+5
| | | |
* | | | Merge topic 'cuda_sanitizer_false_positives'Brad King2022-10-101-4/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 59fcbba65e ctest_memcheck: ignore false-positives in CUDA's compute-sanitizer Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7760
| * | | | ctest_memcheck: ignore false-positives in CUDA's compute-sanitizerTobias Ribizel2022-10-071-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a list of false-positive messages from CUDA's compute-sanitizer to the CTest memcheck. Fixes: #24001
* | | | | Merge topic 'Intel-Fortran-warn-errors'Brad King2022-10-101-3/+7
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13f3382b1c Intel/IntelLLVM: Fortran has distinct "-Werror"-like flag ab8a0a106e COMPILE_WARNING_AS_ERROR: Fix internal formatting of options table Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7758
| * | | | COMPILE_WARNING_AS_ERROR: Fix internal formatting of options tableBrad King2022-10-071-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 76a08cd253 (COMPILE_WARNING_AS_ERROR: Add options to treat warnings as errors, 2022-04-21, v3.24.0-rc1~173^2) we formatted the options table entries as command-line string fragments. Since they are part of the `CMAKE_${lang}_COMPILE_OPTIONS_*` tables, they should be formatted as `;`-separated lists of compiler options.
* | | | | CMake Nightly Date StampKitware Robot2022-10-101-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2022-10-091-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2022-10-081-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'clang-tidy-prefer-p-option'Brad King2022-10-071-7/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3f4e0839c4 clang-tidy: Don't append compiler commands if using -p Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7753
| * | | | clang-tidy: Don't append compiler commands if using -pCraig Scott2022-10-071-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the -p option is given to clang-tidy, it doesn't need the compile command line to be appended. It can get everything it needs from the compile_commands.json file in the directory specified with the -p option. When the compiler being used is not the system default compiler, clang-tidy has been observed to pick up the wrong headers when the compiler command line is given, but not if only the -p option is used. Therefore, don't append the compiler command line if -p is present in the <LANG>_CLANG_TIDY target property. Fixes: #24017
* | | | | Merge topic 'improve-symlink-error-reporting'Brad King2022-10-075-42/+82
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 569fb1893e file(INSTALL): Report "Installing:" for a symlink to a directory 1461ae4933 file(INSTALL): Clarify symlink vs dir conflict errors 85f01a1ec2 file(INSTALL): Improve formatting of symlink creation error aba48bd6ac cmSystemTools: Provide quiet link creation methods Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7706
| * | | | | file(INSTALL): Report "Installing:" for a symlink to a directoryJohn Parent2022-10-061-1/+4
| | | | | |
| * | | | | file(INSTALL): Clarify symlink vs dir conflict errorsJohn Parent2022-10-061-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify error reporting in scenario creating a symlink where a directory previously exists.