Brad King authored 2 years ago and Kitware Robot committed 2 years ago

25e9f318 curl: Set build options the way we need for CMake
9ffe6b09 Merge branch 'upstream-curl' into update-curl
ec122fff curl 2022-10-26 (cd95ee9f)
fa9bbb86 curl: Update script to get curl 7.86.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7851

Brad King authored 2 years ago and Kitware Robot committed 2 years ago

183b9a9e CMP0141: Fix PCH REUSE_FROM under policy NEW behavior
4d13f472 Tests: Drop redundant project init from RunCMake.PrecompileHeaders cases
2e65fe92 cmLocalGenerator: Clarify name of local PDB type variable
17096aeb 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

Brad King authored 2 years ago and Kitware Robot committed 2 years ago

301815eb FindCUDAToolkit: Add nvptxcompiler_static dependency on Threads::Threads

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7853

* upstream-curl:
  curl 2022-10-26 (cd95ee9f)

Curl Upstream authored 2 years ago and Brad King committed 2 years ago

Code extracted from:

    https://github.com/curl/curl.git

at commit cd95ee9f771361acf241629d2fe5507e308082a2 (curl-7_86_0).

Under the CMP0141 NEW behavior added by commit 0e96a204 (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

The `CMakeLists.txt` file already calls `cmake_minimum_required` and
`project` before including each case's code.

Brad King authored 2 years ago and Kitware Robot committed 2 years ago

d7867187 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

Brad King authored 2 years ago and Kitware Robot committed 2 years ago

988b9928 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

Brad King authored 2 years ago and Kitware Robot committed 2 years ago

9a0ca7df Tests: Fix RunCMake.VsDotnetSdk with VS >= 17.3 on ARM64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7842

Brad King authored 2 years ago and Kitware Robot committed 2 years ago

a0d4e3bf cmGeneratedFileStream: Drop unused WriteRaw method
2e5af30c Ninja: Match showIncludes dependencies using console output code page
e1c16791 cm_codecvt: Add support for the Windows console output code page
328c1518 cmGeneratedFileStream: Add support for a temporary alternate encoding

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7845

Brad King authored 2 years ago and Kitware Robot committed 2 years ago

024e3d2b Xcode: Put object files in a place that Xcode cleans

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7843

Letu Ren authored 2 years ago and Brad King committed 2 years ago

ArchLinux uses `/lib` for 64-bit libraries and there is no `/lib64`.
However, unlike Debian, 32-bit libraries are in `/lib32`.

Aurelien Regat-Barrel authored 2 years ago and Brad King committed 2 years ago

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

It has been superseded by `WriteAltEncoding`.

Generalize the fix from commit 37a279f8 (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

This is distinct from the Windows ANSI code page.

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.

Since commit dc5fc898 (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

Anthony Roberts authored 2 years ago and Brad King committed 2 years ago

VS 17.3 provides an arm64-native version of the tool, but the test was
looking for the x64 version.

Brad King authored 2 years ago and Kitware Robot committed 2 years ago

919ab832 FindGLUT: Fix regression when pkg-config is not available

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7840

Brad King authored 2 years ago and Kitware Robot committed 2 years ago

d2d1be06 VS: Fix paths in multi-target SDK-style projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7836

Brad King authored 2 years ago and Kitware Robot committed 2 years ago

8d5631f0 Xcode: Revert "Don't set INSTALL_PATH unless target is SHARED_LIBRARY"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7839

Craig Scott authored 2 years ago and Kitware Robot committed 2 years ago

3fc2dcd8 Help: Minor formatting and cross-ref cleanup for <CONFIG>_POSTFIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7841

In commit a2fc4b62 (FindGLUT: Drop the now-unnecessary exclusion of
pkg-config for multiconfig, 2022-10-13, v3.25.0-rc2~16^2) we
accidentally removed the entire condition around the `pkg-config` code
path instead of just the multi-config part.

Fixes: #24095

The change in commit 61acaa12 (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

Sebastian Maisch authored 2 years ago and Brad King committed 2 years ago

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 7671d712 (VS: Fix
target output paths in SDK-style projects, 2022-09-23, v3.25.0-rc1~82^2).

Fixes: #24094
Issue: #23989

Brad King authored 2 years ago and Kitware Robot committed 2 years ago

7ecbe324 cmake --workflow: add --fresh option
7d9aa0f0 cmake::Workflow: Refactor to use enum class argument
322193af cmake --workflow: print usage and exit on unrecognized argument
70aef294 cmake --workflow: print usage message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7825