From 24f6ef8208b489e46556ee714d7e74439a59c90c Mon Sep 17 00:00:00 2001
From: Christoph Lehmann <christoph.lehmann@ufz.de>
Date: Fri, 7 Oct 2022 16:00:39 +0200
Subject: [PATCH] [T] Make testrunner build in wheel build
---
Tests/CMakeLists.txt | 28 ++++++++++++++++++++++------
1 file changed, 22 insertions(+), 6 deletions(-)
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 784efaca6d0..f472bab731a 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -24,7 +24,9 @@ append_source_files(TEST_SOURCES GeoLib/IO)
append_source_files(TEST_SOURCES MaterialLib)
append_source_files(TEST_SOURCES MathLib)
append_source_files(TEST_SOURCES MeshLib)
+if(NOT OGS_WHEEL_BUILD)
append_source_files(TEST_SOURCES ApplicationsLib)
+endif()
append_source_files(TEST_SOURCES MeshGeoToolsLib)
append_source_files(TEST_SOURCES_NUMLIB NumLib)
# Disable Unity build for NumLib tests
@@ -34,9 +36,12 @@ set_source_files_properties(
# Keep order of source files, otherwise PETSc non-MPI tests fail
set(TEST_SOURCES ${TEST_SOURCES} ${TEST_SOURCES_NUMLIB})
append_source_files(TEST_SOURCES ParameterLib)
-append_source_files(TEST_SOURCES ProcessLib)
-if(OGS_BUILD_PROCESS_TH2M)
- append_source_files(TEST_SOURCES ProcessLib/TH2M)
+
+if(NOT OGS_WHEEL_BUILD)
+ append_source_files(TEST_SOURCES ProcessLib)
+ if(OGS_BUILD_PROCESS_TH2M)
+ append_source_files(TEST_SOURCES ProcessLib/TH2M)
+ endif()
endif()
if(OGS_BUILD_GUI)
@@ -67,7 +72,7 @@ ogs_add_executable(testrunner ${TEST_SOURCES})
target_link_libraries(
testrunner
- PRIVATE ApplicationsLib
+ PRIVATE $<$<NOT:$<BOOL:${OGS_WHEEL_BUILD}>>:ApplicationsLib>
ApplicationsFileIO
autocheck
gmock
@@ -78,8 +83,8 @@ target_link_libraries(
MeshLib
NumLib
ParameterLib
- ProcessLib
- Processes
+ $<$<NOT:$<BOOL:${OGS_WHEEL_BUILD}>>:ProcessLib>
+ $<$<NOT:$<BOOL:${OGS_WHEEL_BUILD}>>:Processes>
TestInfoLib
VTK::FiltersGeneral
VTK::FiltersSources
@@ -94,6 +99,17 @@ target_link_libraries(
PUBLIC $<$<BOOL:${OGS_USE_MFRONT}>:OgsMFrontBehaviourForUnitTests>
)
+target_compile_definitions(
+ testrunner
+ PUBLIC # Enabled elements
+ OGS_MAX_ELEMENT_DIM=${OGS_MAX_ELEMENT_DIM}
+ OGS_MAX_ELEMENT_ORDER=${OGS_MAX_ELEMENT_ORDER}
+ $<$<BOOL:${OGS_ENABLE_ELEMENT_SIMPLEX}>:OGS_ENABLE_ELEMENT_SIMPLEX>
+ $<$<BOOL:${OGS_ENABLE_ELEMENT_CUBOID}>:OGS_ENABLE_ELEMENT_CUBOID>
+ $<$<BOOL:${OGS_ENABLE_ELEMENT_PRISM}>:OGS_ENABLE_ELEMENT_PRISM>
+ $<$<BOOL:${OGS_ENABLE_ELEMENT_PYRAMID}>:OGS_ENABLE_ELEMENT_PYRAMID>
+)
+
if(OGS_BUILD_GUI)
target_compile_definitions(testrunner PUBLIC OGS_BUILD_GUI)
target_link_libraries(
--
GitLab