summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* nghttp2: Update script to get nghttp2 1.50.0Brad King2022-10-311-1/+1
|
* Merge topic 'tests-FindPkgConfig'Brad King2022-10-313-31/+47
|\ | | | | | | | | | | | | | | | | | | fc8f8d82f2 Tests: Disable parts of FindPkgConfig tests without wide supported 96d7b5a6d1 Tests: pkg_check_modules() doesn't allow spaces in a moduleSpec afd1b28cea Tests: Disable broken FindPkgConfig test cases for Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7847
| * Tests: Disable parts of FindPkgConfig tests without wide supportedCraig Scott2022-10-291-15/+25
| | | | | | | | | | | | | | | | | | | | Some pkg-config implementations on Windows don't return the same results as those on other platforms. They appear to be bugs in those implementations, the one that comes with Strawberry perl being one case where this was observed. The handling of Libs and Cflags entries is incomplete, resulting in some flags not being reported where they should be. These are faults in the pkg-config implementation, not in CMake or its tests, so we disable those parts of the tests on Windows to avoid reporting false positives.
| * Tests: pkg_check_modules() doesn't allow spaces in a moduleSpecCraig Scott2022-10-291-10/+11
| | | | | | | | | | | | | | | | | | The documentation of pkg_check_modules() is a little ambiguous about whether spaces are allowed in a moduleSpec that includes a version constraint. All examples in the docs do not have spaces, so it could be claimed spaces are not supported. The tests fail on Windows when spaces are included, likely because some pkg-config implementations don't support that. Update the tests to not assume spaces are supported as part of a moduleSpec.
| * Tests: Disable broken FindPkgConfig test cases for WindowsCraig Scott2022-10-291-6/+11
| | | | | | | | | | | | | | | | | | The Windows implementation of these tests have been found to not handle Windows paths and path separators properly in a number of areas. The whole approach taken in these tests appears dubious, so they may need to be significantly rewritten. Disable them until then so we don't get false positives. Issue: #22031
* | Merge topic 'ewilde/swift-output-file-map-logic'Brad King2022-10-318-37/+47
|\ \ | | | | | | | | | | | | | | | | | | | | | e88509d0e8 Swift: Omit output-file-map when used as a linker Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7835
| * | Swift: Omit output-file-map when used as a linkerEvan Wilde2022-10-288-37/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Swift is used as the linker for non-swift files because it needs to pull files like swiftrt.o in when swift symbols are present to ensure that the swift runtime is linked. The swift driver uses clang as the underlying linker, which pulls in crtbegin.o and friends when appropriate, so using Swift as a linker for C/C++ libraries is fine. The output-file-map was getting passed to all Swift invocations, regardless of whether or not we generated one. This patch changes it so that we only include the output-file-map in the Swift compiler invocation if we have actually generated the file.
* | | Merge topic 'vs-CLRSupport'Brad King2022-10-3114-9/+175
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | eef13a4b33 VS: Add COMMON_LANGUAGE_RUNTIME support for "netcore" 0815329dbc Help: Format COMMON_LANGUAGE_RUNTIME values as a definition list Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7807
| * | | VS: Add COMMON_LANGUAGE_RUNTIME support for "netcore"ζeh Matt2022-10-2814-4/+160
| | | | | | | | | | | | | | | | | | | | | | | | Generate `CLRSupport` for Visual Studio projects. Fixes: #22054
| * | | Help: Format COMMON_LANGUAGE_RUNTIME values as a definition listBrad King2022-10-281-5/+15
| | |/ | |/|
* | | Merge branch 'release-3.25'Brad King2022-10-310-0/+0
|\ \ \
| * \ \ 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
* | \ \ \ Merge topic 'file-download-log-with-hash'Brad 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 branch 'release-3.25'Brad King2022-10-310-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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
* | \ \ \ \ Merge topic 'ArchLinux-lib-dir'Brad 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 branch 'release-3.25'Brad King2022-10-310-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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
* | \ \ \ \ Merge topic 'vs-dotnetsdk-arm64'Brad 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 branch 'release-3.25'Brad King2022-10-310-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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
* | \ \ \ \ Merge topic 'ninja-showIncludes-encoding'Brad 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.
* | | | | Merge branch 'release-3.25'Brad King2022-10-310-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'xcode-obj-dir' into release-3.25Brad King2022-10-319-16/+44
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 024e3d2bf6 Xcode: Put object files in a place that Xcode cleans Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7843
* | | | | Merge topic 'xcode-obj-dir'Brad King2022-10-319-16/+44
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 024e3d2bf6 Xcode: Put object files in a place that Xcode cleans Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7843
| * | | | Xcode: Put object files in a place that Xcode cleansBrad King2022-10-289-16/+44
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | CMake Nightly Date StampKitware Robot2022-10-311-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2022-10-301-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2022-10-291-1/+1
| |/ / |/| |
* | | Merge topic 'clang-tidy-module-script-fixes'Brad King2022-10-281-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 18d2bd71af clang-tidy module: build as release, output on test failure Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7834
| * | | clang-tidy module: build as release, output on test failureKyle Edwards2022-10-261-1/+2
| | | | | | | | | | | | | | | | | | | | Build the module with -DCMAKE_BUILD_TYPE=Release, and run ctest with --output-on-failure.
* | | | Merge topic 'timestamp-timezone'Brad King2022-10-288-7/+105
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9da542d5c1 string(TIMESTAMP): Add %z and %Z for adding time zone string Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7788
| * | | | string(TIMESTAMP): Add %z and %Z for adding time zone stringVasiliy Koyrev2022-10-278-7/+105
| | | | | | | | | | | | | | | | | | | | Fixes: #24056
* | | | | Merge topic 'extended-profiling'Brad King2022-10-285-21/+106
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0fe7aae91f cmake: Add profiling events for configure and generate 3d6a8d7eac cmMakefileProfilingData: Refactor to use RAII Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7828
| * | | | | cmake: Add profiling events for configure and generateKyle Edwards2022-10-272-1/+10
| | | | | |
| * | | | | cmMakefileProfilingData: Refactor to use RAIIKyle Edwards2022-10-264-21/+97
| | |/ / / | |/| | | | | | | | | | | | | And add a more generic StartEntry() method.
* | | | | Merge topic 'tutorial_step7_update'Brad King2022-10-283-25/+158
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f9ef15f3dc Tutorial: Update step 7 style Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7787
| * | | | | Tutorial: Update step 7 styleMarkus Ferrell2022-10-273-25/+158
| | |/ / / | |/| | |
* | | | | Merge topic 'tutorial_step5_cleanup'Brad King2022-10-281-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 43f87741f4 Tutorial: Fix Step 5 solution after update to Step 6 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7838
| * | | | | Tutorial: Fix Step 5 solution after update to Step 6Markus Ferrell2022-10-271-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 6e58a01f4e (Tutorial: Update step 6 style, 2022-10-06) the `literalinclude` included an extra comment from step 6 instructions. Fix the include bounds to remove the extra text.
* | | | | Merge branch 'release-3.25'Brad King2022-10-280-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge topic 'FindGLUT-pkg-config' into release-3.25Brad King2022-10-281-3/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 919ab832e8 FindGLUT: Fix regression when pkg-config is not available Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7840
* | \ \ \ \ Merge topic 'FindGLUT-pkg-config'Brad King2022-10-281-3/+5
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 919ab832e8 FindGLUT: Fix regression when pkg-config is not available Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7840