Skip to content
Snippets Groups Projects
Commit 67d793d6 authored by peters's avatar peters
Browse files

Fix CMakeFile

parent ab69d5f2
No related branches found
No related tags found
1 merge request!34Add new library, which contains the calculation of the macroscopic quantities and a general cumulant computation. (Closes #13)
......@@ -127,7 +127,6 @@ endif()
if(BUILD_USE_OPENMP)
find_package(OpenMP REQUIRED)
<<<<<<< HEAD
endif()
find_package(MPI REQUIRED)
......@@ -137,24 +136,6 @@ add_subdirectory(src/basics)
add_subdirectory(src/lbm)
#################################################################################
# VIRTUAL FLUIDS CPU / GPU
#################################################################################
if (BUILD_VF_CPU)
include (cpu.cmake)
endif()
if(BUILD_VF_GPU)
include (gpu.cmake)
=======
>>>>>>> develop
endif()
find_package(MPI REQUIRED)
add_subdirectory(src/basics)
#################################################################################
# VIRTUAL FLUIDS CPU / GPU
#################################################################################
......
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