Skip to content
Snippets Groups Projects
Commit 25f5dac5 authored by Sören Peters's avatar Sören Peters
Browse files

Merge branch 'feature/openmp_optional' into 'develop'

Make openmp optional for virtualfluids cpu. Closes #1

Closes #1

See merge request irmb/VirtualFluids_dev!16
parents 00048ae5 b287bee3
No related branches found
No related tags found
1 merge request!16Make openmp optional for virtualfluids cpu. Closes #1
...@@ -35,6 +35,8 @@ set (VF_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}) ...@@ -35,6 +35,8 @@ set (VF_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
option(BUILD_VF_CPU "Build VirtualFluids cpu variant" OFF) option(BUILD_VF_CPU "Build VirtualFluids cpu variant" OFF)
option(BUILD_VF_GPU "Build VirtualFluids gpu variant" OFF) option(BUILD_VF_GPU "Build VirtualFluids gpu variant" OFF)
option(BUILD_USE_OPENMP "Build VirtualFluids with openmp" OFF)
# vf gpu # vf gpu
option(BUILD_VF_GPU "Build VirtualFluids GPU" ON ) option(BUILD_VF_GPU "Build VirtualFluids GPU" ON )
option(BUILD_VF_GKS "Build VirtualFluids GKS" OFF ) option(BUILD_VF_GKS "Build VirtualFluids GKS" OFF )
......
...@@ -27,7 +27,9 @@ vf_add_library(BUILDTYPE static PUBLIC_LINK basics muparser ${CAB_ADDITIONAL_LIN ...@@ -27,7 +27,9 @@ vf_add_library(BUILDTYPE static PUBLIC_LINK basics muparser ${CAB_ADDITIONAL_LIN
vf_get_library_name(library_name) vf_get_library_name(library_name)
linkOpenMP(${library_name}) if(BUILD_USE_OPENMP)
linkOpenMP(${library_name})
endif()
target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/BoundaryConditions) target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/BoundaryConditions)
target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Connectors) target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Connectors)
......
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