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

CMake: do not use target webview in monolithic build

Browse Source
This commit is contained in:
Maarten Bent
2021-03-06 18:46:29 +01:00
parent 1c57699e92
commit 560656c699
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,9 +69,12 @@ elseif(WXMSW)
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")
if (NOT wxBUILD_MONOLITHIC)
target_compile_options(wxwebview PRIVATE -Wno-unknown-pragmas) target_compile_options(wxwebview PRIVATE -Wno-unknown-pragmas)
endif() endif()
endif()
if (NOT wxBUILD_MONOLITHIC)
if (CMAKE_SIZEOF_VOID_P EQUAL 4) if (CMAKE_SIZEOF_VOID_P EQUAL 4)
set(WEBVIEW2_ARCH x86) set(WEBVIEW2_ARCH x86)
else() else()
@@ -83,6 +86,7 @@ elseif(WXMSW)
"${WEBVIEW2_PACKAGE_DIR}/build/native/${WEBVIEW2_ARCH}/WebView2Loader.dll" "${WEBVIEW2_PACKAGE_DIR}/build/native/${WEBVIEW2_ARCH}/WebView2Loader.dll"
"$<TARGET_FILE_DIR:wxwebview>/WebView2Loader.dll") "$<TARGET_FILE_DIR:wxwebview>/WebView2Loader.dll")
endif() endif()
endif()
elseif(WXGTK) elseif(WXGTK)
if(LIBSOUP_FOUND) if(LIBSOUP_FOUND)
wx_lib_include_directories(wxwebview PUBLIC ${LIBSOUP_INCLUDE_DIRS}) wx_lib_include_directories(wxwebview PUBLIC ${LIBSOUP_INCLUDE_DIRS})