cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: copy webview2 loader for monolithic build

Browse Source
This commit is contained in:
Maarten Bent 2021-03-08 00:26:24 +01:00
parent 3198ed0b18
commit 0bb9cd004d
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/cmake/lib/CMakeLists.txt
View File

@ -99,6 +99,7 @@ if(wxBUILD_MONOLITHIC)
foreach(file ${wxMONO_NONCOMPILED_CPP_FILES})
set_source_files_properties(${file} PROPERTIES HEADER_FILE_ONLY TRUE)
endforeach()
wx_webview_copy_webview2_loader(wxmono)
wx_finalize_lib(wxmono)
endif()

31
build/cmake/lib/webview/CMakeLists.txt
View File

@ -9,6 +9,24 @@
include(../../source_groups.cmake)
function(wx_webview_copy_webview2_loader target)
if(NOT WXMSW OR NOT wxUSE_WEBVIEW_EDGE OR NOT TARGET ${target})
return()
endif()
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
set(WEBVIEW2_ARCH x86)
else()
set(WEBVIEW2_ARCH x64)
endif()
add_custom_command(TARGET ${target} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy
"${WEBVIEW2_PACKAGE_DIR}/build/native/${WEBVIEW2_ARCH}/WebView2Loader.dll"
"$<TARGET_FILE_DIR:${target}>/WebView2Loader.dll")
endfunction()
wx_append_sources(WEBVIEW_FILES WEBVIEW_CMN)
if(WXMSW)
@ -77,18 +95,7 @@ elseif(WXMSW)
endif()
endif()
if (NOT wxBUILD_MONOLITHIC)
if (CMAKE_SIZEOF_VOID_P EQUAL 4)
set(WEBVIEW2_ARCH x86)
else()
set(WEBVIEW2_ARCH x64)
endif()
add_custom_command(TARGET wxwebview POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy
"${WEBVIEW2_PACKAGE_DIR}/build/native/${WEBVIEW2_ARCH}/WebView2Loader.dll"
"$<TARGET_FILE_DIR:wxwebview>/WebView2Loader.dll")
endif()
wx_webview_copy_webview2_loader(wxwebview)
endif()
elseif(WXGTK)
if(LIBSOUP_FOUND)