mirror of https://github.com/microsoft/vcpkg.git
toolchains: fix MSVC rc.exe invocation (#51151)
Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
parent
bb63f3b28d
commit
d7b75fa8a3
|
|
@ -82,7 +82,7 @@ if(NOT _VCPKG_WINDOWS_TOOLCHAIN)
|
|||
|
||||
set(CMAKE_CXX_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${CHARSET_FLAG} ${VCPKG_CXX_FLAGS}" CACHE STRING "")
|
||||
set(CMAKE_C_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${CHARSET_FLAG} ${VCPKG_C_FLAGS}" CACHE STRING "")
|
||||
set(CMAKE_RC_FLAGS "-c65001 ${_vcpkg_cpp_flags}" CACHE STRING "")
|
||||
set(CMAKE_RC_FLAGS "/c65001 ${_vcpkg_cpp_flags}" CACHE STRING "")
|
||||
|
||||
unset(CHARSET_FLAG)
|
||||
unset(MP_BUILD_FLAG)
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ if(NOT _VCPKG_WINDOWS_TOOLCHAIN)
|
|||
string(APPEND CMAKE_CXX_FLAGS " /arm64EC /D_AMD64_ /DAMD64 /D_ARM64EC_ /DARM64EC")
|
||||
string(APPEND CMAKE_C_FLAGS " /arm64EC /D_AMD64_ /DAMD64 /D_ARM64EC_ /DARM64EC")
|
||||
endif()
|
||||
set(CMAKE_RC_FLAGS "-c65001 /DWIN32" CACHE STRING "")
|
||||
set(CMAKE_RC_FLAGS "/c65001 /DWIN32" CACHE STRING "")
|
||||
|
||||
set(CMAKE_CXX_FLAGS_DEBUG "${VCPKG_CRT_LINK_FLAG_PREFIX}d /Z7 /Ob0 /Od /RTC1 ${VCPKG_CXX_FLAGS_DEBUG}" CACHE STRING "")
|
||||
set(CMAKE_C_FLAGS_DEBUG "${VCPKG_CRT_LINK_FLAG_PREFIX}d /Z7 /Ob0 /Od /RTC1 ${VCPKG_C_FLAGS_DEBUG}" CACHE STRING "")
|
||||
|
|
|
|||
|
|
@ -160,7 +160,7 @@ if(NOT _VCPKG_WINDOWS_TOOLCHAIN)
|
|||
|
||||
set(CMAKE_CXX_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${VCPKG_CXX_FLAGS}" CACHE STRING "")
|
||||
set(CMAKE_C_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${VCPKG_C_FLAGS}" CACHE STRING "")
|
||||
set(CMAKE_RC_FLAGS "-c65001 ${_vcpkg_cpp_flags}" CACHE STRING "")
|
||||
set(CMAKE_RC_FLAGS "/c65001 ${_vcpkg_cpp_flags}" CACHE STRING "")
|
||||
|
||||
unset(_vcpkg_cpp_flags)
|
||||
unset(_vcpkg_common_flags)
|
||||
|
|
|
|||
Loading…
Reference in New Issue