mirror of
https://gitlab.winehq.org/wine/vkd3d.git
synced 2025-04-13 05:43:18 -07:00
build: Add option to disable tests.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
committed by
Alexandre Julliard
parent
50fe2b7638
commit
0bbf92404d
@@ -137,12 +137,14 @@ vkd3d_compiler_SOURCES = programs/vkd3d-compiler/main.c
|
|||||||
vkd3d_compiler_LDADD = libvkd3d-shader.la
|
vkd3d_compiler_LDADD = libvkd3d-shader.la
|
||||||
|
|
||||||
LDADD = libvkd3d.la libvkd3d-utils.la
|
LDADD = libvkd3d.la libvkd3d-utils.la
|
||||||
check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests)
|
|
||||||
AM_DEFAULT_SOURCE_EXT = .c
|
AM_DEFAULT_SOURCE_EXT = .c
|
||||||
|
if BUILD_TESTS
|
||||||
|
check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests)
|
||||||
TESTS = $(vkd3d_tests) $(vkd3d_cross_tests)
|
TESTS = $(vkd3d_tests) $(vkd3d_cross_tests)
|
||||||
tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@
|
tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@
|
||||||
tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@
|
tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@
|
||||||
tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la
|
tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la
|
||||||
|
endif
|
||||||
|
|
||||||
if BUILD_DEMOS
|
if BUILD_DEMOS
|
||||||
DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@
|
DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@
|
||||||
|
10
configure.ac
10
configure.ac
@@ -11,7 +11,12 @@ AC_ARG_VAR([CROSSCC64], [64-bit Windows cross compiler])
|
|||||||
AC_ARG_WITH([xcb], AS_HELP_STRING([--with-xcb], [Build with XCB library (default: test)]))
|
AC_ARG_WITH([xcb], AS_HELP_STRING([--with-xcb], [Build with XCB library (default: test)]))
|
||||||
AC_ARG_WITH([spirv-tools], AS_HELP_STRING([--with-spirv-tools],
|
AC_ARG_WITH([spirv-tools], AS_HELP_STRING([--with-spirv-tools],
|
||||||
[Build with SPIRV-Tools library (default: disabled)]))
|
[Build with SPIRV-Tools library (default: disabled)]))
|
||||||
AC_ARG_ENABLE([demos], AS_HELP_STRING([--enable-demos], [Build demo programs (default: disabled)]))
|
AC_ARG_ENABLE([demos],
|
||||||
|
AS_HELP_STRING([--enable-demos], [Build demo programs (default: disabled)]),,
|
||||||
|
[enable_demos=no])
|
||||||
|
AC_ARG_ENABLE([tests],
|
||||||
|
AS_HELP_STRING([--enable-tests], [Build tests (default: enabled)]),,
|
||||||
|
[enable_tests=yes])
|
||||||
|
|
||||||
AC_USE_SYSTEM_EXTENSIONS
|
AC_USE_SYSTEM_EXTENSIONS
|
||||||
|
|
||||||
@@ -107,10 +112,10 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_
|
|||||||
VKD3D_CHECK_PTHREAD_SETNAME_NP
|
VKD3D_CHECK_PTHREAD_SETNAME_NP
|
||||||
|
|
||||||
dnl Makefiles
|
dnl Makefiles
|
||||||
AS_IF([test "x$enable_demos" != "xyes"], [enable_demos=no])
|
|
||||||
AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"],
|
AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"],
|
||||||
[AC_MSG_ERROR([libxcb is required for demos.])])
|
[AC_MSG_ERROR([libxcb is required for demos.])])
|
||||||
AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"])
|
AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"])
|
||||||
|
AM_CONDITIONAL([BUILD_TESTS], [test "x$enable_tests" != "xno"])
|
||||||
AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"])
|
AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"])
|
||||||
AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"])
|
AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"])
|
||||||
AM_CONDITIONAL([HAVE_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"])
|
AM_CONDITIONAL([HAVE_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"])
|
||||||
@@ -129,6 +134,7 @@ AS_ECHO(["
|
|||||||
Have SPIRV-Tools: ${with_spirv_tools}
|
Have SPIRV-Tools: ${with_spirv_tools}
|
||||||
|
|
||||||
Building demos: ${enable_demos}
|
Building demos: ${enable_demos}
|
||||||
|
Building tests: ${enable_tests}
|
||||||
|
|
||||||
Building crosstests: ${HAVE_CROSSTEST}"])
|
Building crosstests: ${HAVE_CROSSTEST}"])
|
||||||
AS_IF([test "x$CROSSTARGET32" != "xno"], [AS_ECHO([" Using 32-bit cross compiler: $CROSSCC32"])])
|
AS_IF([test "x$CROSSTARGET32" != "xno"], [AS_ECHO([" Using 32-bit cross compiler: $CROSSCC32"])])
|
||||||
|
Reference in New Issue
Block a user