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

Link tests with webview library only if it is actually available.

Browse Source 
This allows the tests to build again even on the machines without the
prerequisites for building wxWebView.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-10-30 14:19:59 +00:00
parent 74e0e33a85
commit ea10101a15
11 changed files with 46 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
autoconf_inc.m4
View File

@@ -374,7 +374,7 @@ dnl ### begin block 20_COND_MONOLITHIC_0_USE_STC_1[wx.bkl] ###
COND_MONOLITHIC_0_USE_STC_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_USE_STC_1)
dnl ### begin block 20_COND_MONOLITHIC_0_USE_WEBVIEW_1[wx.bkl] ###
dnl ### begin block 20_COND_MONOLITHIC_0_USE_WEBVIEW_1[../../tests/test.bkl,wx.bkl] ###
COND_MONOLITHIC_0_USE_WEBVIEW_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$USE_WEBVIEW" = "x1" ; then
COND_MONOLITHIC_0_USE_WEBVIEW_1=""

2
build/bakefiles/common.bkl
View File

@@ -162,7 +162,7 @@
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('stc')))</if>
</set>
<set var="WXLIB_WEBVIEW">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('webview')))</if>
<if cond="MONOLITHIC=='0' and USE_WEBVIEW=='1'">$(mk.evalExpr(wxwin.mkLibName('webview')))</if>
</set>
<set var="WXLIB_MONO">
<if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>

4
tests/Makefile.in
View File

@@ -286,9 +286,9 @@ TEST_GUI_ODEP = $(_____pch_testprec_test_gui_testprec_h_gch___depname)
@COND_ICC_PCH_1@ ./.pch/testprec_test_gui/testprec.h.gch
@COND_USE_PCH_1@_____pch_testprec_test_gui_testprec_h_gch___depname \
@COND_USE_PCH_1@ = ./.pch/testprec_test_gui/testprec.h.gch
COND_MONOLITHIC_0___WXLIB_WEBVIEW_p = \
COND_MONOLITHIC_0_USE_WEBVIEW_1___WXLIB_WEBVIEW_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_WEBVIEW_p = $(COND_MONOLITHIC_0___WXLIB_WEBVIEW_p)
@COND_MONOLITHIC_0_USE_WEBVIEW_1@__WXLIB_WEBVIEW_p = $(COND_MONOLITHIC_0_USE_WEBVIEW_1___WXLIB_WEBVIEW_p)
COND_MONOLITHIC_0___WXLIB_RICHTEXT_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_RICHTEXT_p = $(COND_MONOLITHIC_0___WXLIB_RICHTEXT_p)

2
tests/makefile.bcc
View File

@@ -283,7 +283,7 @@ ____CAIRO_INCLUDEDIR_FILENAMES_3_p = -i$(CAIRO_ROOT)\include\cairo
!if "$(SHARED)" == "1"
__DLLFLAG_p_3 = -dWXUSINGDLL
!endif
!if "$(MONOLITHIC)" == "0"
!if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1"
__WXLIB_WEBVIEW_p = \
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib
!endif

2
tests/makefile.gcc
View File

@@ -280,9 +280,11 @@ ifeq ($(SHARED),1)
__DLLFLAG_p_3 = --define WXUSINGDLL
endif
ifeq ($(MONOLITHIC),0)
ifeq ($(USE_WEBVIEW),1)
__WXLIB_WEBVIEW_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview
endif
endif
ifeq ($(MONOLITHIC),0)
__WXLIB_RICHTEXT_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext

2
tests/makefile.vc
View File

@@ -364,7 +364,7 @@ ____CAIRO_INCLUDEDIR_FILENAMES_3_p = /i $(CAIRO_ROOT)\include\cairo
!if "$(SHARED)" == "1"
__DLLFLAG_p_3 = /d WXUSINGDLL
!endif
!if "$(MONOLITHIC)" == "0"
!if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1"
__WXLIB_WEBVIEW_p = \
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib
!endif

2
tests/makefile.wat
View File

@@ -78,9 +78,11 @@ __test_gui___depname = $(OBJS)\test_gui.exe
!endif
__WXLIB_WEBVIEW_p =
!ifeq MONOLITHIC 0
!ifeq USE_WEBVIEW 1
__WXLIB_WEBVIEW_p = &
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib
!endif
!endif
__WXLIB_RICHTEXT_p =
!ifeq MONOLITHIC 0
__WXLIB_RICHTEXT_p = &

8
tests/test.bkl
View File

@@ -213,7 +213,13 @@
window/setsize.cpp
xml/xrctest.cpp
</sources>
<wx-lib>webview</wx-lib>
<!--
Can't use <wx-lib> here as it doesn't work with conditionally
defined variables, so fall back <sys-lib> as we must not link with
inexisting webview library to be able to run tests even if
wxWebView is not available.
-->
<sys-lib>$(WXLIB_WEBVIEW)</sys-lib>
<wx-lib>richtext</wx-lib>
<wx-lib>media</wx-lib>
<wx-lib>xrc</wx-lib>