From fad4eefc6a938c81cceda627a4ed29979246781f Mon Sep 17 00:00:00 2001
From: Michael Kuron <mkuron@icp.uni-stuttgart.de>
Date: Tue, 12 Nov 2019 09:52:11 +0100
Subject: [PATCH] Don't build VariantTest if Boost is not available
---
src/waLBerlaDefinitions.in.h | 1 +
tests/core/CMakeLists.txt | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/waLBerlaDefinitions.in.h b/src/waLBerlaDefinitions.in.h
index bb9b6d029..654eb55ab 100644
--- a/src/waLBerlaDefinitions.in.h
+++ b/src/waLBerlaDefinitions.in.h
@@ -53,6 +53,7 @@
#cmakedefine WALBERLA_USE_STD_ANY
#cmakedefine WALBERLA_USE_STD_EXPERIMENTAL_OPTIONAL
#cmakedefine WALBERLA_USE_STD_OPTIONAL
+#cmakedefine WALBERLA_USE_STD_VARIANT
#cmakedefine WALBERLA_BUILD_WITH_BACKTRACE
#ifdef WALBERLA_BUILD_WITH_BACKTRACE
#define WALBERLA_BACKTRACE_HEADER "${Backtrace_HEADER}"
diff --git a/tests/core/CMakeLists.txt b/tests/core/CMakeLists.txt
index fa77e164a..4d58647b8 100644
--- a/tests/core/CMakeLists.txt
+++ b/tests/core/CMakeLists.txt
@@ -209,8 +209,10 @@ waLBerla_execute_test( NAME UNIQUEID PROCESSES 4)
waLBerla_compile_test( FILES VersionTest.cpp )
waLBerla_execute_test( NAME VersionTest )
-waLBerla_compile_test( FILES VariantTest )
-waLBerla_execute_test( NAME VariantTest )
+if( WALBERLA_BUILD_WITH_BOOST OR WALBERLA_USE_STD_VARIANT )
+ waLBerla_compile_test( FILES VariantTest )
+ waLBerla_execute_test( NAME VariantTest )
+endif()
##################
# load_balancing #
--
GitLab