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

Silence unknown pragmas warning in the WebView2 header

Browse Source 
Using wxGCC_WARNING_SUPPRESS(unknown-pragmas) around the webview2 header does
not work, so suppress it for the entire webview project.
This commit is contained in:
Maarten Bent
2021-02-28 15:10:38 +01:00
committed by Vadim Zeitlin
parent fc3cfb67cf
commit 272c903234
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/bakefiles/multilib.bkl
View File

@@ -184,6 +184,10 @@
<if cond="TOOLKIT=='MSW' and IS_MSVC=='0'">$(TOP_SRCDIR)include/wx/msw/wrl</if> <if cond="TOOLKIT=='MSW' and IS_MSVC=='0'">$(TOP_SRCDIR)include/wx/msw/wrl</if>
</set> </set>
<set var="webview_edge_pragma_warning">
<if cond="TOOLKIT=='MSW' and IS_MSVC=='0'">-Wno-unknown-pragmas</if>
</set>
<dll id="webviewdll" template="wx_dll" <dll id="webviewdll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'"> cond="SHARED=='1' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define> <define>WXUSINGDLL</define>
@@ -195,6 +199,7 @@
<msvc-headers>$(WEBVIEW_HDR)</msvc-headers> <msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
<include>$(webview_additional_include_wrl)</include> <include>$(webview_additional_include_wrl)</include>
<include>$(webview_additional_include)</include> <include>$(webview_additional_include)</include>
<cxxflags-mingw>$(webview_edge_pragma_warning)</cxxflags-mingw>
</dll> </dll>
<lib id="webviewlib" template="wx_lib" <lib id="webviewlib" template="wx_lib"
@@ -203,6 +208,7 @@
<msvc-headers>$(WEBVIEW_HDR)</msvc-headers> <msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
<include>$(webview_additional_include_wrl)</include> <include>$(webview_additional_include_wrl)</include>
<include>$(webview_additional_include)</include> <include>$(webview_additional_include)</include>
<cxxflags-mingw>$(webview_edge_pragma_warning)</cxxflags-mingw>
</lib> </lib>
<wxshortcut id="wxwebview" cond="MONOLITHIC=='0' and USE_WEBVIEW=='1'"/> <wxshortcut id="wxwebview" cond="MONOLITHIC=='0' and USE_WEBVIEW=='1'"/>

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

@@ -69,6 +69,7 @@ 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")
target_compile_options(wxwebview PRIVATE -Wno-unknown-pragmas)
endif() endif()
if (CMAKE_SIZEOF_VOID_P EQUAL 4) if (CMAKE_SIZEOF_VOID_P EQUAL 4)

7
build/msw/makefile.gcc
View File

@@ -1142,7 +1142,8 @@ WEBVIEWDLL_CXXFLAGS = -I..\..\src\tiff\libtiff -I..\..\src\jpeg \
$(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING -DWXUSINGDLL \ $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING -DWXUSINGDLL \
-DWXMAKINGDLL_WEBVIEW -I..\..\include\wx\msw\wrl \ -DWXMAKINGDLL_WEBVIEW -I..\..\include\wx\msw\wrl \
-I..\..\3rdparty\webview2\build\native\include $(__RTTIFLAG) \ -I..\..\3rdparty\webview2\build\native\include $(__RTTIFLAG) \
$(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy -Wno-unknown-pragmas $(CPPFLAGS) \
$(CXXFLAGS)
WEBVIEWDLL_OBJECTS = \ WEBVIEWDLL_OBJECTS = \
$(OBJS)\webviewdll_dummy.o \ $(OBJS)\webviewdll_dummy.o \
$(OBJS)\webviewdll_webview_ie.o \ $(OBJS)\webviewdll_webview_ie.o \
@@ -1159,8 +1160,8 @@ WEBVIEWLIB_CXXFLAGS = -I..\..\src\tiff\libtiff -I..\..\src\jpeg \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \
-I..\..\include\wx\msw\wrl -I..\..\3rdparty\webview2\build\native\include \ -I..\..\include\wx\msw\wrl -I..\..\3rdparty\webview2\build\native\include \
$(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \
$(CXXFLAGS) -Wno-unknown-pragmas $(CPPFLAGS) $(CXXFLAGS)
WEBVIEWLIB_OBJECTS = \ WEBVIEWLIB_OBJECTS = \
$(OBJS)\webviewlib_dummy.o \ $(OBJS)\webviewlib_dummy.o \
$(OBJS)\webviewlib_webview_ie.o \ $(OBJS)\webviewlib_webview_ie.o \