Skip to content

Commit 9b5cb8e

Browse files
authored
[vcpkg_build_nmake] Fix /MP -> /FS transformation (microsoft#41815)
1 parent a469702 commit 9b5cb8e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

scripts/cmake/vcpkg_build_nmake.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function(vcpkg_build_nmake)
3737
endif()
3838

3939
if(NOT DEFINED arg_CL_LANGUAGE)
40-
vcpkg_list(SET arg_CL_LANGUAGE CXX)
40+
set(arg_CL_LANGUAGE CXX)
4141
endif()
4242

4343
find_program(NMAKE nmake REQUIRED)
@@ -57,8 +57,8 @@ function(vcpkg_build_nmake)
5757
get_filename_component(JOM_EXE_PATH "${JOM}" DIRECTORY)
5858
vcpkg_add_to_path("${JOM_EXE_PATH}")
5959
if(arg_CL_LANGUAGE AND "${VCPKG_DETECTED_CMAKE_${arg_CL_LANGUAGE}_COMPILER_ID}" STREQUAL "MSVC")
60-
string(REGEX REPLACE " [/-]MP[0-9]* " " " VCPKG_COMBINED_${arg_CL_LANGUAGE}_FLAGS_DEBUG " ${VCPKG_COMBINED_${arg_CL_LANGUAGE}_FLAGS_DEBUG} /FS")
61-
string(REGEX REPLACE " [/-]MP[0-9]* " " " VCPKG_COMBINED_${arg_CL_LANGUAGE}_FLAGS_RELEASE " ${VCPKG_COMBINED_${arg_CL_LANGUAGE}_FLAGS_RELEASE} /FS")
60+
string(REGEX REPLACE " [/-]MP[0-9]* " " " VCPKG_DETECTED_CMAKE_${arg_CL_LANGUAGE}_FLAGS_DEBUG " ${VCPKG_DETECTED_CMAKE_${arg_CL_LANGUAGE}_FLAGS_DEBUG} /FS")
61+
string(REGEX REPLACE " [/-]MP[0-9]* " " " VCPKG_DETECTED_CMAKE_${arg_CL_LANGUAGE}_FLAGS_RELEASE " ${VCPKG_DETECTED_CMAKE_${arg_CL_LANGUAGE}_FLAGS_RELEASE} /FS")
6262
endif()
6363
else()
6464
set(arg_PREFER_JOM FALSE)

0 commit comments

Comments
 (0)