Zebediah Figura : build: Do not cross-compile tests if tests are not enabled.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 2e4367a470ab359b342c07b26a29bd60ebd55545
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=2e4367a470ab359b342c07b2...

Author: Zebediah Figura 
Date:   Fri Apr  1 16:01:13 2022 -0500

build: Do not cross-compile tests if tests are not enabled.

Signed-off-by: Zebediah Figura 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

Makefile.am  | 22 ++++++++++++++++++----
 configure.ac |  4 +++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c93b2062..f49f9642 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -445,11 +445,18 @@ if HAVE_CROSSTARGET32
 CROSS32_CC = @CROSSCC32@
 CROSS32_DLLTOOL = @CROSSTARGET32@-dlltool
 CROSS32_IMPLIBS = $(cross_implibs:=.cross32.a)
-CROSS32_EXEFILES = $(vkd3d_cross_tests:=.cross32.exe)
+CROSS32_EXEFILES =
+if BUILD_TESTS
+CROSS32_EXEFILES += $(vkd3d_cross_tests:=.cross32.exe)
+endif
 if BUILD_DEMOS
 CROSS32_EXEFILES += $(vkd3d_demos:demos/vkd3d-%=demos/%.cross32.exe)
 endif
-CROSS32_FILES = $(CROSS32_EXEFILES) tests/shader_runner.cross32.exe
+
+CROSS32_FILES = $(CROSS32_EXEFILES)
+if BUILD_TESTS
+CROSS32_FILES += tests/shader_runner.cross32.exe
+endif

CLEANFILES += $(CROSS32_IMPLIBS) $(CROSS32_FILES)
 crosstest32: $(CROSS32_FILES)
@@ -479,11 +486,18 @@ if HAVE_CROSSTARGET64
 CROSS64_CC = @CROSSCC64@
 CROSS64_DLLTOOL = @CROSSTARGET64@-dlltool
 CROSS64_IMPLIBS = $(cross_implibs:=.cross64.a)
-CROSS64_EXEFILES = $(vkd3d_cross_tests:=.cross64.exe)
+CROSS64_EXEFILES =
+if BUILD_TESTS
+CROSS64_EXEFILES += $(vkd3d_cross_tests:=.cross64.exe)
+endif
 if BUILD_DEMOS
 CROSS64_EXEFILES += $(vkd3d_demos:demos/vkd3d-%=demos/%.cross64.exe)
 endif
-CROSS64_FILES = $(CROSS64_EXEFILES) tests/shader_runner.cross64.exe
+
+CROSS64_FILES = $(CROSS64_EXEFILES)
+if BUILD_TESTS
+CROSS64_FILES += tests/shader_runner.cross64.exe
+endif

CLEANFILES += $(CROSS64_IMPLIBS) $(CROSS64_FILES)
 crosstest64: $(CROSS64_FILES)
diff --git a/configure.ac b/configure.ac
index 97551d89..a58e453f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -165,6 +165,8 @@ AS_IF([test "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno"],
       [HAVE_CROSSTARGET=yes], [HAVE_CROSSTARGET=no])
 AS_IF([test $DX_FLAG_doc = 1], [HAVE_DOCS=yes], [HAVE_DOCS=no])

+AS_IF([test "x$enable_demos" != "xyes" -a "x$enable_tests" = "xno"], [CROSSTARGET64=no CROSSTARGET32=no])
+
 AS_ECHO(["
   Configuration summary for $PACKAGE $VERSION

@@ -180,7 +182,7 @@ AS_ECHO(["
 "])

AS_IF([test "x$enable_demos" = "xyes"], [AS_ECHO(["  Cross-compiling demos: ${HAVE_CROSSTARGET}"])])
-AS_ECHO(["  Cross-compiling tests: ${HAVE_CROSSTARGET}"])
+AS_IF([test "x$enable_tests" != "xno"], [AS_ECHO(["  Cross-compiling tests: ${HAVE_CROSSTARGET}"])])
 AS_IF([test "x$CROSSTARGET32" != "xno"], [AS_ECHO(["    Using 32-bit cross compiler: $CROSSCC32"])])
 AS_IF([test "x$CROSSTARGET64" != "xno"], [AS_ECHO(["    Using 64-bit cross compiler: $CROSSCC64"])])
 AS_ECHO([])