[vcpkg_build_nmake] Fix /MP -> /FS transformation (#41815)

microsoft · Nov 14, 2024 · 9b5cb8e · 9b5cb8e
1 parent a469702
commit 9b5cb8e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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)