From e9296e11796568e70aa6308482ceb61fd1e4ae9f Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 5 Jun 2024 14:47:51 +0200 Subject: [PATCH] [client,sdl] fix architecture paths for WebView2 --- cmake/WebView2.cmake | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cmake/WebView2.cmake b/cmake/WebView2.cmake index e580779ab..a833ec5a5 100644 --- a/cmake/WebView2.cmake +++ b/cmake/WebView2.cmake @@ -37,6 +37,13 @@ endif() function(target_link_webview2 target) if(WIN32) + if (CMAKE_CXX_COMPILER_ARCHITECTURE_ID) + set(ARCH ${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}) + elseif (CMAKE_C_COMPILER_ARCHITECTURE_ID) + set(ARCH ${CMAKE_C_COMPILER_ARCHITECTURE_ID}) + else() + message(FATAL_ERROR "Unknown CMAKE__COMPILER_ARCHITECTURE_ID") + endif() target_include_directories(${target} PRIVATE "${WEBVIEW2_PACKAGE_DIR}/build/native/include" @@ -45,7 +52,7 @@ function(target_link_webview2 target) PRIVATE shlwapi version - "${WEBVIEW2_PACKAGE_DIR}/build/native/${CMAKE_VS_PLATFORM_NAME}/WebView2LoaderStatic.lib" + "${WEBVIEW2_PACKAGE_DIR}/build/native/${ARCH}/WebView2LoaderStatic.lib" ) endif() endfunction()