From 9b5cb8e554487f3edb5d50b80188883846f81e14 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 14 Nov 2024 12:16:06 +0100 Subject: [PATCH] [vcpkg_build_nmake] Fix /MP -> /FS transformation (#41815) --- scripts/cmake/vcpkg_build_nmake.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/cmake/vcpkg_build_nmake.cmake b/scripts/cmake/vcpkg_build_nmake.cmake index 8e28f34e19058c..ffc68d8d81b02c 100755 --- a/scripts/cmake/vcpkg_build_nmake.cmake +++ b/scripts/cmake/vcpkg_build_nmake.cmake @@ -37,7 +37,7 @@ function(vcpkg_build_nmake) endif() if(NOT DEFINED arg_CL_LANGUAGE) - vcpkg_list(SET arg_CL_LANGUAGE CXX) + set(arg_CL_LANGUAGE CXX) endif() find_program(NMAKE nmake REQUIRED) @@ -57,8 +57,8 @@ function(vcpkg_build_nmake) get_filename_component(JOM_EXE_PATH "${JOM}" DIRECTORY) vcpkg_add_to_path("${JOM_EXE_PATH}") if(arg_CL_LANGUAGE AND "${VCPKG_DETECTED_CMAKE_${arg_CL_LANGUAGE}_COMPILER_ID}" STREQUAL "MSVC") - string(REGEX REPLACE " [/-]MP[0-9]* " " " VCPKG_COMBINED_${arg_CL_LANGUAGE}_FLAGS_DEBUG " ${VCPKG_COMBINED_${arg_CL_LANGUAGE}_FLAGS_DEBUG} /FS") - string(REGEX REPLACE " [/-]MP[0-9]* " " " VCPKG_COMBINED_${arg_CL_LANGUAGE}_FLAGS_RELEASE " ${VCPKG_COMBINED_${arg_CL_LANGUAGE}_FLAGS_RELEASE} /FS") + string(REGEX REPLACE " [/-]MP[0-9]* " " " VCPKG_DETECTED_CMAKE_${arg_CL_LANGUAGE}_FLAGS_DEBUG " ${VCPKG_DETECTED_CMAKE_${arg_CL_LANGUAGE}_FLAGS_DEBUG} /FS") + string(REGEX REPLACE " [/-]MP[0-9]* " " " VCPKG_DETECTED_CMAKE_${arg_CL_LANGUAGE}_FLAGS_RELEASE " ${VCPKG_DETECTED_CMAKE_${arg_CL_LANGUAGE}_FLAGS_RELEASE} /FS") endif() else() set(arg_PREFER_JOM FALSE)