Skip to content
Snippets Groups Projects
Commit bddddbc0 authored by TESLA01\soerenpeters's avatar TESLA01\soerenpeters
Browse files

Add a fix for the numerical tests, where all compile definitions were...

Add a fix for the numerical tests, where all compile definitions were overwritten by set_target_properties().
parent 6bf7e8bf
No related branches found
No related tags found
No related merge requests found
......@@ -49,6 +49,8 @@ option(USE_OPENMP "Include OpenMP support" ON)
option(BUILD_VF_PYTHON_BINDINGS "" OFF)
option(BUILD_VF_DOUBLE_ACCURACY "Use double accuracy" OFF)
#################################################################################
# CMAKE POLICIES
#################################################################################
......@@ -66,6 +68,10 @@ endif()
include(CMakePrintHelpers)
include(${VF_CMAKE_DIR}/VirtualFluidsMacros.cmake)
IF( BUILD_VF_DOUBLE_ACCURACY )
list(APPEND VF_COMPILER_DEFINITION VF_DOUBLE_ACCURACY)
ENDIF()
#################################################################################
# COMMON LIBRARIES
#################################################################################
......
......@@ -8,9 +8,7 @@ groupTarget(${library_name} ${testFolder})
if(BUILD_SHARED_LIBS)
# add compile option according to
# https://github.com/google/googletest/blob/master/googletest/README.md#as-a-shared-library-dll
set_target_properties(${library_name}
PROPERTIES
COMPILE_DEFINITIONS "GTEST_LINKED_AS_SHARED_LIBRARY=1")
target_compile_definitions (${library_name} PRIVATE "GTEST_LINKED_AS_SHARED_LIBRARY=1")
endif()
linkCUDA()
......@@ -12,16 +12,10 @@
#############################################################
option(VF.BUILD_VF_GPU "Build VirtualFluids GPU" ON )
option(VF.BUILD_VF_GKS "Build VirtualFluids GKS" OFF )
option(VF.BUILD_VF_TRAFFIC "Build VirtualFluids Traffic" ON)
option(VF.BUILD_VF_TRAFFIC "Build VirtualFluids Traffic" OFF)
option(VF.BUILD_JSONCPP "Builds json cpp " OFF)
option(VF.BUILD_NUMERIC_TESTS "Build numeric tests" OFF)
option(VF.BUILD_DOUBLE_ACCURACY "Use double accuracy" OFF )
IF( VF.BUILD_DOUBLE_ACCURACY )
list(APPEND VF_COMPILER_DEFINITION VF_DOUBLE_ACCURACY)
ENDIF()
#############################################################
if(VF.BUILD_NUMERIC_TESTS)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment