From 91c1aed57f80b06a53bd24a1231e27c23b22d141 Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Thu, 3 Apr 2025 07:19:04 -0600 Subject: [PATCH] Revert "Meta: Add workaround for CMake 4.0 policy minimum changes" This reverts commit 04d44c9b26270ac3c738a49eedcf57b19ebaadad. --- Meta/CMake/vcpkg/generate_vcpkg_toolchain_variables.cmake | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Meta/CMake/vcpkg/generate_vcpkg_toolchain_variables.cmake b/Meta/CMake/vcpkg/generate_vcpkg_toolchain_variables.cmake index 22fb6541d15..34184b1fa18 100644 --- a/Meta/CMake/vcpkg/generate_vcpkg_toolchain_variables.cmake +++ b/Meta/CMake/vcpkg/generate_vcpkg_toolchain_variables.cmake @@ -17,11 +17,6 @@ if (LINUX AND NOT LAGOM_USE_LINKER) string(APPEND EXTRA_VCPKG_VARIABLES "set(ENV{LDFLAGS} -Wl,-z,noseparate-code)\n") endif() -# Temporary workaround until a version of vcpkg with https://github.com/microsoft/vcpkg/pull/44712 is released -if (CMAKE_VERSION VERSION_GREATER_EQUAL "4.0") - string(APPEND EXTRA_VCPKG_VARIABLES "set(ENV{CMAKE_POLICY_VERSION_MINIMUM} 3.5)\n") -endif() - file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/build-vcpkg-variables.cmake" "${EXTRA_VCPKG_VARIABLES}") # Munge the VCPKG_TRIPLET to correspond to the right one for our presets