morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 08:54:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10253 from akallabeth/webview2-arch-detect

Browse Source 
[client,sdl] fix architecture paths for WebView2
This commit is contained in:
akallabeth
2024-06-05 15:19:58 +02:00
committed by GitHub
parent 82e2bdd116 39dd6a53b3
commit 90b4e54d7f
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/clang-tidy-post.yml vendored
View File

@@ -9,6 +9,7 @@ on:
permissions:
pull-requests: write
issues: write
repository: read
jobs:
build:

9
cmake/WebView2.cmake
View File

@@ -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_<lang>_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()