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

Merge branch 'cmake-mono-webview' of https://github.com/MaartenBent/wxWidgets

Browse Source 
CMake: fix monolithic build with webview.

See https://github.com/wxWidgets/wxWidgets/pull/2269
This commit is contained in:
Vadim Zeitlin
2021-03-09 21:44:27 +01:00
parent 7228dbf50c 0bb9cd004d
commit 2551df746d
2 changed files with 27 additions and 12 deletions
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}) foreach(file ${wxMONO_NONCOMPILED_CPP_FILES})
set_source_files_properties(${file} PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties(${file} PROPERTIES HEADER_FILE_ONLY TRUE)
endforeach() endforeach()
wx_webview_copy_webview2_loader(wxmono)
wx_finalize_lib(wxmono) wx_finalize_lib(wxmono)
endif() endif()

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

@@ -9,6 +9,24 @@
include(../../source_groups.cmake) 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) wx_append_sources(WEBVIEW_FILES WEBVIEW_CMN)
if(WXMSW) if(WXMSW)
@@ -44,13 +62,15 @@ elseif(WXMSW)
set(WEBVIEW2_DEFAULT_PACKAGE_DIR "${CMAKE_BINARY_DIR}/packages/Microsoft.Web.WebView2.${WEBVIEW2_VERSION}") set(WEBVIEW2_DEFAULT_PACKAGE_DIR "${CMAKE_BINARY_DIR}/packages/Microsoft.Web.WebView2.${WEBVIEW2_VERSION}")
if(NOT EXISTS ${WEBVIEW2_PACKAGE_DIR})
unset(WEBVIEW2_PACKAGE_DIR CACHE)
endif()
find_path(WEBVIEW2_PACKAGE_DIR find_path(WEBVIEW2_PACKAGE_DIR
NAMES build/native/include/WebView2.h NAMES build/native/include/WebView2.h
PATHS PATHS
"${PROJECT_SOURCE_DIR}/3rdparty/webview2" "${PROJECT_SOURCE_DIR}/3rdparty/webview2"
${WEBVIEW2_DEFAULT_PACKAGE_DIR} ${WEBVIEW2_DEFAULT_PACKAGE_DIR}
) )
mark_as_advanced(WEBVIEW2_PACKAGE_DIR)
if (NOT WEBVIEW2_PACKAGE_DIR) if (NOT WEBVIEW2_PACKAGE_DIR)
message(STATUS "WebView2 SDK not found locally, downloading...") message(STATUS "WebView2 SDK not found locally, downloading...")
@@ -65,23 +85,17 @@ elseif(WXMSW)
WORKING_DIRECTORY ${WEBVIEW2_PACKAGE_DIR} WORKING_DIRECTORY ${WEBVIEW2_PACKAGE_DIR}
) )
endif() endif()
set(WEBVIEW2_PACKAGE_DIR ${WEBVIEW2_PACKAGE_DIR} CACHE INTERNAL "" FORCE)
wx_lib_include_directories(wxwebview PRIVATE "${WEBVIEW2_PACKAGE_DIR}/build/native/include") wx_lib_include_directories(wxwebview PRIVATE "${WEBVIEW2_PACKAGE_DIR}/build/native/include")
if(NOT MSVC) if(NOT MSVC)
wx_lib_include_directories(wxwebview PRIVATE "${wxSOURCE_DIR}/include/wx/msw/wrl") wx_lib_include_directories(wxwebview PRIVATE "${wxSOURCE_DIR}/include/wx/msw/wrl")
target_compile_options(wxwebview PRIVATE -Wno-unknown-pragmas) if (NOT wxBUILD_MONOLITHIC)
target_compile_options(wxwebview PRIVATE -Wno-unknown-pragmas)
endif()
endif() endif()
if (CMAKE_SIZEOF_VOID_P EQUAL 4) wx_webview_copy_webview2_loader(wxwebview)
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() endif()
elseif(WXGTK) elseif(WXGTK)
if(LIBSOUP_FOUND) if(LIBSOUP_FOUND)