Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-27 19:17:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow using system CATCH2 library in configure

Browse Source 
Add --with-catch2 configure option which can be used with "sys" value to
use the system version of CATCH2.

By default, still use the built-in version, however, as it doesn't have
any real drawbacks.

Closes #23654.

Co-authored-by: Vadim Zeitlin <vadim@wxwidgets.org>
This commit is contained in:
Maxim Cournoyer
2025-05-10 18:23:02 +02:00
committed by Vadim Zeitlin
co-authored by Vadim Zeitlin
parent 04d527b629
commit 01ca081d57
6 changed files with 224 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
acinclude.m4
+2 -2
View File
@@ -285,8 +285,8 @@ AC_DEFUN([WX_ARG_SYS_WITH],
fi
],
[
if test "DEFAULT_$3" = no; then
value=no
if test -n "${DEFAULT_$3}"; then
value=${DEFAULT_$3}
elif test "$wxUSE_ALL_FEATURES" = no; then
value=no
elif test "$wxUSE_SYS_LIBS" = no; then
build/bakefiles/config.bkl
+1
View File
@@ -414,6 +414,7 @@ compiled .lib files and setup.h under the lib/ toplevel directory.
<option name="WX_CFLAGS"/>
<option name="WX_CXXFLAGS"/>
<option name="WX_LDFLAGS"/>
<option name="CATCH2_CFLAGS"/>
<option name="HOST_SUFFIX"/>
<option name="DYLIB_RPATH_FLAG"/>
<option name="DYLIB_RPATH_INSTALL"/>
configure
Vendored
+171 -22
View File
@@ -627,6 +627,8 @@ enable_option_checking=fatal
ac_subst_vars='subdirs_extra
LTLIBOBJS
LIBOBJS
CATCH2_LIBS
CATCH2_CFLAGS
RESCOMP
DLLTOOL
GCC
@@ -1093,6 +1095,7 @@ enable_nanox
with_libpng
with_libjpeg
with_libtiff
with_catch2
with_libjbig
with_libxpm
with_libiconv
@@ -1448,7 +1451,9 @@ WEBKIT_LIBS
CAIRO_CFLAGS
CAIRO_LIBS
GST_CFLAGS
GST_LIBS'
GST_LIBS
CATCH2_CFLAGS
CATCH2_LIBS'
# Initialize some variables set by options.
@@ -2369,6 +2374,7 @@ Optional Packages:
--with-libpng use libpng (PNG image format)
--with-libjpeg use libjpeg (JPEG file format)
--with-libtiff use libtiff (TIFF file format)
--with-catch2 use CATCH2 (testing framework)
--without-libjbig don't use libjbig in libtiff even if available
--with-libxpm use libxpm (XPM file format)
--with-libiconv use libiconv (character conversion)
@@ -2506,6 +2512,9 @@ Some influential environment variables:
CAIRO_LIBS linker flags for CAIRO, overriding pkg-config
GST_CFLAGS C compiler flags for GST, overriding pkg-config
GST_LIBS linker flags for GST, overriding pkg-config
CATCH2_CFLAGS
C compiler flags for CATCH2, overriding pkg-config
CATCH2_LIBS linker flags for CATCH2, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -4066,6 +4075,8 @@ DEFAULT_wxUSE_OFFICIAL_BUILD=no
DEFAULT_wxUSE_OBJC_UNIQUIFYING=no
DEFAULT_wxUSE_CATCH2=builtin
@@ -4653,8 +4664,8 @@ if test "${with_libpng+set}" = set; then :
else
if test "DEFAULT_wxUSE_LIBPNG" = no; then
value=no
if test -n "${DEFAULT_wxUSE_LIBPNG}"; then
value=${DEFAULT_wxUSE_LIBPNG}
elif test "$wxUSE_ALL_FEATURES" = no; then
value=no
elif test "$wxUSE_SYS_LIBS" = no; then
@@ -4689,8 +4700,8 @@ if test "${with_libjpeg+set}" = set; then :
else
if test "DEFAULT_wxUSE_LIBJPEG" = no; then
value=no
if test -n "${DEFAULT_wxUSE_LIBJPEG}"; then
value=${DEFAULT_wxUSE_LIBJPEG}
elif test "$wxUSE_ALL_FEATURES" = no; then
value=no
elif test "$wxUSE_SYS_LIBS" = no; then
@@ -4725,8 +4736,8 @@ if test "${with_libtiff+set}" = set; then :
else
if test "DEFAULT_wxUSE_LIBTIFF" = no; then
value=no
if test -n "${DEFAULT_wxUSE_LIBTIFF}"; then
value=${DEFAULT_wxUSE_LIBTIFF}
elif test "$wxUSE_ALL_FEATURES" = no; then
value=no
elif test "$wxUSE_SYS_LIBS" = no; then
@@ -4743,6 +4754,42 @@ fi
eval "$wx_cv_use_libtiff"
# Check whether --with-catch2 was given.
if test "${with_catch2+set}" = set; then :
withval=$with_catch2;
if test "$withval" = yes; then
wx_cv_use_catch2='wxUSE_CATCH2=yes'
elif test "$withval" = no; then
wx_cv_use_catch2='wxUSE_CATCH2=no'
elif test "$withval" = sys; then
wx_cv_use_catch2='wxUSE_CATCH2=sys'
elif test "$withval" = builtin; then
wx_cv_use_catch2='wxUSE_CATCH2=builtin'
else
as_fn_error $? "Invalid value for --with-catch2: should be yes, no, sys, or builtin" "$LINENO" 5
fi
else
if test -n "${DEFAULT_wxUSE_CATCH2}"; then
value=${DEFAULT_wxUSE_CATCH2}
elif test "$wxUSE_ALL_FEATURES" = no; then
value=no
elif test "$wxUSE_SYS_LIBS" = no; then
value=builtin
else
value=yes
fi
wx_cv_use_catch2="wxUSE_CATCH2=$value"
fi
eval "$wx_cv_use_catch2"
if test "$wxUSE_LIBTIFF" = "builtin" ; then
wxUSE_LIBJBIG=no
else
@@ -4796,8 +4843,8 @@ if test "${with_libxpm+set}" = set; then :
else
if test "DEFAULT_wxUSE_LIBXPM" = no; then
value=no
if test -n "${DEFAULT_wxUSE_LIBXPM}"; then
value=${DEFAULT_wxUSE_LIBXPM}
elif test "$wxUSE_ALL_FEATURES" = no; then
value=no
elif test "$wxUSE_SYS_LIBS" = no; then
@@ -5161,8 +5208,8 @@ if test "${with_regex+set}" = set; then :
else
if test "DEFAULT_wxUSE_REGEX" = no; then
value=no
if test -n "${DEFAULT_wxUSE_REGEX}"; then
value=${DEFAULT_wxUSE_REGEX}
elif test "$wxUSE_ALL_FEATURES" = no; then
value=no
elif test "$wxUSE_SYS_LIBS" = no; then
@@ -5226,8 +5273,8 @@ if test "${with_zlib+set}" = set; then :
else
if test "DEFAULT_wxUSE_ZLIB" = no; then
value=no
if test -n "${DEFAULT_wxUSE_ZLIB}"; then
value=${DEFAULT_wxUSE_ZLIB}
elif test "$wxUSE_ALL_FEATURES" = no; then
value=no
elif test "$wxUSE_SYS_LIBS" = no; then
@@ -5262,8 +5309,8 @@ if test "${with_expat+set}" = set; then :
else
if test "DEFAULT_wxUSE_EXPAT" = no; then
value=no
if test -n "${DEFAULT_wxUSE_EXPAT}"; then
value=${DEFAULT_wxUSE_EXPAT}
elif test "$wxUSE_ALL_FEATURES" = no; then
value=no
elif test "$wxUSE_SYS_LIBS" = no; then
@@ -43621,24 +43668,126 @@ fi
if test "$wxUSE_TESTS_SUBDIR" != "no"; then
SUBDIRS="$SUBDIRS tests"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether catch2/catch.hpp exists" >&5
$as_echo_n "checking whether catch2/catch.hpp exists... " >&6; }
if ! test -f "$srcdir/3rdparty/catch/single_include/catch2/catch.hpp" ; then
if test "$wxUSE_CATCH2" = "no"; then
as_fn_error $? "CATCH is required for building tests, use --disable-tests option to disable them" "$LINENO" 5
fi
if test "$wxUSE_CATCH2" != "builtin"; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for catch2 < 3" >&5
$as_echo_n "checking for catch2 < 3... " >&6; }
if test -n "$CATCH2_CFLAGS"; then
pkg_cv_CATCH2_CFLAGS="$CATCH2_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"catch2 < 3\""; } >&5
($PKG_CONFIG --exists --print-errors "catch2 < 3") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_CATCH2_CFLAGS=`$PKG_CONFIG --cflags "catch2 < 3" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test -n "$CATCH2_LIBS"; then
pkg_cv_CATCH2_LIBS="$CATCH2_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"catch2 < 3\""; } >&5
($PKG_CONFIG --exists --print-errors "catch2 < 3") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_CATCH2_LIBS=`$PKG_CONFIG --libs "catch2 < 3" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
as_fn_error $? "
CATCH (C++ Automated Test Cases in Headers) is required, the required file
$srcdir/3rdparty/catch/single_include/catch2/catch.hpp couldn't be found.
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
CATCH2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "catch2 < 3" 2>&1`
else
CATCH2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "catch2 < 3" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$CATCH2_PKG_ERRORS" >&5
if test "$wxUSE_CATCH2" = "sys"; then
as_fn_error $? "system catch2 library not found! \
Use --with-catch2=builtin to use built-in version" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: system catch2 library not found, \
will use built-in instead" >&5
$as_echo "$as_me: WARNING: system catch2 library not found, \
will use built-in instead" >&2;}
wxUSE_CATCH2=builtin
fi
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if test "$wxUSE_CATCH2" = "sys"; then
as_fn_error $? "system catch2 library not found! \
Use --with-catch2=builtin to use built-in version" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: system catch2 library not found, \
will use built-in instead" >&5
$as_echo "$as_me: WARNING: system catch2 library not found, \
will use built-in instead" >&2;}
wxUSE_CATCH2=builtin
fi
else
CATCH2_CFLAGS=$pkg_cv_CATCH2_CFLAGS
CATCH2_LIBS=$pkg_cv_CATCH2_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
fi
if test "$wxUSE_CATCH2" = "builtin"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether catch2/catch.hpp exists" >&5
$as_echo_n "checking whether catch2/catch.hpp exists... " >&6; }
if ! test -f "$srcdir/3rdparty/catch/single_include/catch2/catch.hpp"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
as_fn_error $? "
CATCH2 (C++ Automated Test Cases in Headers) is required, but the file
$srcdir/3rdparty/catch/single_include/catch2/catch.hpp cannot be found.
You might need to run
git submodule update --init 3rdparty/catch
to fix this." "$LINENO" 5
else
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
CATCH2_CFLAGS="-I$wx_top_builddir/3rdparty/catch/single_include"
fi
fi
for subdir in $SUBDIRS; do
configure.ac
+33 -7
View File
@@ -340,6 +340,9 @@ DEFAULT_wxUSE_OFFICIAL_BUILD=no
dnl Always default to no. Only special cases require this.
DEFAULT_wxUSE_OBJC_UNIQUIFYING=no
dnl Prefer to use built-in CATCH library, there are no real drawbacks to it.
DEFAULT_wxUSE_CATCH2=builtin
dnl ===========================
dnl deal with configure options
dnl ===========================
@@ -512,6 +515,7 @@ dnl ---------------------------------------------------------------------------
WX_ARG_SYS_WITH(libpng, [ --with-libpng use libpng (PNG image format)], wxUSE_LIBPNG)
WX_ARG_SYS_WITH(libjpeg, [ --with-libjpeg use libjpeg (JPEG file format)], wxUSE_LIBJPEG)
WX_ARG_SYS_WITH(libtiff, [ --with-libtiff use libtiff (TIFF file format)], wxUSE_LIBTIFF)
WX_ARG_SYS_WITH(catch2, [ --with-catch2 use CATCH2 (testing framework)], wxUSE_CATCH2)
dnl We don't provide built-in version of this library, so if the use of system
dnl libraries is explicitly disabled, we can't use it at all.
@@ -8217,22 +8221,44 @@ if test "$wxUSE_TESTS_SUBDIR" != "no"; then
dnl Configure tests directory
SUBDIRS="$SUBDIRS tests"
if test "$wxUSE_CATCH2" = "no"; then
AC_MSG_ERROR([CATCH is required for building tests, use --disable-tests option to disable them])
fi
dnl Check for catch (C++ Automated Test Cases in Headers) availability.
AC_MSG_CHECKING([whether catch2/catch.hpp exists])
if ! test -f "$srcdir/3rdparty/catch/single_include/catch2/catch.hpp" ; then
AC_MSG_RESULT([no])
AC_MSG_ERROR([
CATCH (C++ Automated Test Cases in Headers) is required, the required file
$srcdir/3rdparty/catch/single_include/catch2/catch.hpp couldn't be found.
if test "$wxUSE_CATCH2" != "builtin"; then
dnl TODO: Support catch2 version 3, which does not
dnl ship a catch2/catch.hpp header anymore.
PKG_CHECK_MODULES([CATCH2], [catch2 < 3],, [
if test "$wxUSE_CATCH2" = "sys"; then
AC_MSG_ERROR([system catch2 library not found! \
Use --with-catch2=builtin to use built-in version])
else
AC_MSG_WARN([system catch2 library not found, \
will use built-in instead])
wxUSE_CATCH2=builtin
fi])
fi
if test "$wxUSE_CATCH2" = "builtin"; then
AC_MSG_CHECKING([whether catch2/catch.hpp exists])
if ! test -f "$srcdir/3rdparty/catch/single_include/catch2/catch.hpp"; then
AC_MSG_RESULT([no])
AC_MSG_ERROR([
CATCH2 (C++ Automated Test Cases in Headers) is required, but the file
$srcdir/3rdparty/catch/single_include/catch2/catch.hpp cannot be found.
You might need to run
git submodule update --init 3rdparty/catch
to fix this.])
else
fi
AC_MSG_RESULT([yes])
CATCH2_CFLAGS="-I$wx_top_builddir/3rdparty/catch/single_include"
fi
AC_SUBST(CATCH2_CFLAGS)
fi
for subdir in $SUBDIRS; do
tests/Makefile.in
+13 -14
View File
@@ -43,6 +43,7 @@ EXTRALIBS_WEBVIEW = @EXTRALIBS_WEBVIEW@
WX_CPPFLAGS = @WX_CPPFLAGS@
WX_CXXFLAGS = @WX_CXXFLAGS@
WX_LDFLAGS = @WX_LDFLAGS@
CATCH2_CFLAGS = @CATCH2_CFLAGS@
HOST_SUFFIX = @HOST_SUFFIX@
DYLIB_RPATH_FLAG = @DYLIB_RPATH_FLAG@
SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
@@ -57,8 +58,8 @@ LIBDIRNAME = $(wx_top_builddir)/lib
TEST_CXXFLAGS = $(__test_PCH_INC) $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
-DwxUSE_GUI=0 -I$(top_srcdir)/3rdparty/catch/single_include $(WX_CXXFLAGS) \
$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
-DwxUSE_GUI=0 $(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CATCH2_CFLAGS) \
$(CPPFLAGS) $(CXXFLAGS)
TEST_OBJECTS = \
$(__test___win32rc) \
test_test.o \
@@ -151,9 +152,8 @@ TEST_ODEP = $(_____pch_testprec_test_testprec_h_gch___depname)
TEST_DRAWING_CXXFLAGS = $(__test_drawing_PCH_INC) $(WX_CPPFLAGS) \
-D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 \
-I$(top_srcdir)/3rdparty/catch/single_include $(WX_CXXFLAGS) \
$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
-I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) \
$(CATCH2_CFLAGS) $(CPPFLAGS) $(CXXFLAGS)
TEST_DRAWING_OBJECTS = \
$(__test_drawing___win32rc) \
test_drawing_test.o \
@@ -172,8 +172,8 @@ TEST_DRAWINGPLUGIN_OBJECTS = \
TEST_GUI_CXXFLAGS = $(__test_gui_PCH_INC) $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
-I$(srcdir)/../samples -I$(top_srcdir)/3rdparty/catch/single_include \
$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
-I$(srcdir)/../samples $(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CATCH2_CFLAGS) \
$(CPPFLAGS) $(CXXFLAGS)
TEST_GUI_OBJECTS = \
$(__test_gui___win32rc) \
test_gui_asserthelper.o \
@@ -287,9 +287,8 @@ TEST_GUI_ODEP = $(_____pch_testprec_test_gui_testprec_h_gch___depname)
TEST_ALLHEADERS_CXXFLAGS = $(__test_allheaders_PCH_INC) $(WX_CPPFLAGS) \
-D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../samples \
-I$(top_srcdir)/3rdparty/catch/single_include $(WX_CXXFLAGS) \
$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../samples $(WX_CXXFLAGS) \
$(SAMPLES_CXXFLAGS) $(CATCH2_CFLAGS) $(CPPFLAGS) $(CXXFLAGS)
TEST_ALLHEADERS_OBJECTS = \
$(__test_allheaders___win32rc) \
test_allheaders_asserthelper.o \
@@ -658,7 +657,7 @@ xart-dothraki:
done
test_test_rc.o: $(srcdir)/../tests/test.rc $(TEST_ODEP)
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_10) $(__DEBUG_DEFINE_p_10) $(__EXCEPTIONS_DEFINE_p_10) $(__RTTI_DEFINE_p_10) $(__THREAD_DEFINE_p_10) --include-dir $(srcdir) $(__DLLFLAG_p_10) --define wxUSE_GUI=0 --include-dir $(top_srcdir)/samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/3rdparty/catch/single_include
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_10) $(__DEBUG_DEFINE_p_10) $(__EXCEPTIONS_DEFINE_p_10) $(__RTTI_DEFINE_p_10) $(__THREAD_DEFINE_p_10) --include-dir $(srcdir) $(__DLLFLAG_p_10) --define wxUSE_GUI=0 --include-dir $(top_srcdir)/samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
test_test.o: $(srcdir)/test.cpp $(TEST_ODEP)
$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/test.cpp
@@ -919,7 +918,7 @@ test_xmltest.o: $(srcdir)/xml/xmltest.cpp $(TEST_ODEP)
$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/xml/xmltest.cpp
test_drawing_test_rc.o: $(srcdir)/../tests/test.rc $(TEST_DRAWING_ODEP)
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_10) $(__DEBUG_DEFINE_p_10) $(__EXCEPTIONS_DEFINE_p_10) $(__RTTI_DEFINE_p_10) $(__THREAD_DEFINE_p_10) --include-dir $(srcdir) $(__DLLFLAG_p_10) --define wxUSE_GUI=0 --include-dir $(top_srcdir)/samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/3rdparty/catch/single_include
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_10) $(__DEBUG_DEFINE_p_10) $(__EXCEPTIONS_DEFINE_p_10) $(__RTTI_DEFINE_p_10) $(__THREAD_DEFINE_p_10) --include-dir $(srcdir) $(__DLLFLAG_p_10) --define wxUSE_GUI=0 --include-dir $(top_srcdir)/samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
test_drawing_test.o: $(srcdir)/test.cpp $(TEST_DRAWING_ODEP)
$(CXXC) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(srcdir)/test.cpp
@@ -940,7 +939,7 @@ test_drawingplugin_pluginsample.o: $(srcdir)/drawing/pluginsample.cpp
$(CXXC) -c -o $@ $(TEST_DRAWINGPLUGIN_CXXFLAGS) $(srcdir)/drawing/pluginsample.cpp
test_gui_test_rc.o: $(srcdir)/../tests/test.rc $(TEST_GUI_ODEP)
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_10) $(__DEBUG_DEFINE_p_10) $(__EXCEPTIONS_DEFINE_p_10) $(__RTTI_DEFINE_p_10) $(__THREAD_DEFINE_p_10) --include-dir $(srcdir) $(__DLLFLAG_p_10) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/3rdparty/catch/single_include
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_10) $(__DEBUG_DEFINE_p_10) $(__EXCEPTIONS_DEFINE_p_10) $(__RTTI_DEFINE_p_10) $(__THREAD_DEFINE_p_10) --include-dir $(srcdir) $(__DLLFLAG_p_10) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
test_gui_asserthelper.o: $(srcdir)/asserthelper.cpp $(TEST_GUI_ODEP)
$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/asserthelper.cpp
@@ -1264,7 +1263,7 @@ test_gui_xrctest.o: $(srcdir)/xml/xrctest.cpp $(TEST_GUI_ODEP)
$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/xml/xrctest.cpp
test_allheaders_test_rc.o: $(srcdir)/../tests/test.rc $(TEST_ALLHEADERS_ODEP)
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_10) $(__DEBUG_DEFINE_p_10) $(__EXCEPTIONS_DEFINE_p_10) $(__RTTI_DEFINE_p_10) $(__THREAD_DEFINE_p_10) --include-dir $(srcdir) $(__DLLFLAG_p_10) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/3rdparty/catch/single_include
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_10) $(__DEBUG_DEFINE_p_10) $(__EXCEPTIONS_DEFINE_p_10) $(__RTTI_DEFINE_p_10) $(__THREAD_DEFINE_p_10) --include-dir $(srcdir) $(__DLLFLAG_p_10) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
test_allheaders_asserthelper.o: $(srcdir)/asserthelper.cpp $(TEST_ALLHEADERS_ODEP)
$(CXXC) -c -o $@ $(TEST_ALLHEADERS_CXXFLAGS) $(srcdir)/asserthelper.cpp
tests/test.bkl
+4 -1
View File
@@ -15,8 +15,11 @@
<if cond="FORMAT=='autoconf'">
<res-include>$(RCDEFDIR)</res-include>
<res-include>$(TOP_SRCDIR)include</res-include>
<cxxflags>$(CATCH2_CFLAGS)</cxxflags>
</if>
<if cond="FORMAT!='autoconf'">
<include>$(TOP_SRCDIR)3rdparty/catch/single_include</include>
</if>
<include>$(TOP_SRCDIR)3rdparty/catch/single_include</include>
<if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
<if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">