- moved cpu/apps to apps/cpu

CMake/VirtualFluidsMacros.cmake

@@ -126,8 +126,6 @@ function(vf_add_library)
         TARGET_LINK_LIBRARIES(${library_name} PRIVATE ${CAB_ADDITIONAL_LINK_LIBRARIES})
     ENDIF()
 
-    get_target_property(OUT ${library_name} LINK_LIBRARIES)
-    message(STATUS My libs: ${OUT})
 
     #################################################################
     ###   COMPILER Flags                                          ###
@@ -169,6 +167,8 @@ function(vf_add_library)
     endif()
 
     target_include_directories(${library_name} PRIVATE ${CMAKE_BINARY_DIR})
+    #target_include_directories(${library_name} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+    target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
 endfunction(vf_add_library)
 

CMakeLists.txt

@@ -12,10 +12,29 @@ option(BUILD_VF_CPU "Build VirtualFluids cpu variant" OFF)
 option(BUILD_VF_GPU "Build VirtualFluids gpu variant" ON)
 
 
-include("CMake/CMakeCABMacros.cmake")
-include("CMake/FileUtilities.cmake")
-include("CMake/VirtualFluidsMacros.cmake")
-
+include("${CMAKE_PATH}/CMakeCABMacros.cmake")
+include("${CMAKE_PATH}/FileUtilities.cmake")
+include("${CMAKE_PATH}/VirtualFluidsMacros.cmake")
+
+
+SET(USE_ZOLTAN OFF CACHE BOOL "include Zoltan library support")
+SET(USE_METIS ON CACHE BOOL "include METIS library support")
+SET(USE_MPI ON CACHE BOOL "include MPI library support")
+SET(USE_VTK OFF CACHE BOOL "include VTK library support")
+SET(USE_CATALYST OFF CACHE BOOL "include Paraview Catalyst support")
+SET(USE_BOOST OFF CACHE BOOL "include Boost support")
+#SET(USE_PYTHON OFF CACHE BOOL "include Python scripting support")
+#SET(USE_FETOL OFF CACHE BOOL "include FETOL library support")
+SET(USE_INTEL OFF CACHE BOOL "include Intel compiler support")
+SET(USE_GCC OFF CACHE BOOL "include gcc compiler support")
+SET(USE_HLRN_LUSTRE OFF CACHE BOOL "include HLRN Lustre support")
+SET(USE_DEM_COUPLING OFF CACHE BOOL "PE plugin")
+IF(${USE_MPI})
+    LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_MPI)
+ENDIF()
+IF(${USE_METIS})
+    LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_METIS)
+ENDIF()
 # FIND MPI
 IF((NOT ${CMAKE_CXX_COMPILER} MATCHES mpicxx) AND (NOT ${CMAKE_CXX_COMPILER} MATCHES mpiicpc))# OR NOT ${CMAKE_CXX_COMPILER} MATCHES cc OR NOT ${CMAKE_CXX_COMPILER} MATCHES mpiCC)
     FIND_PACKAGE(MPI REQUIRED)
@@ -27,5 +46,8 @@ add_subdirectory(src/basics)
     add_subdirectory(cpu)
 #endif()
 #if(BUILD_VF_GPU)
- #   add_subdirectory(gpu)
-#endif()
\ No newline at end of file
+#    add_subdirectory(gpu)
+#endif()
+
+set (APPS_ROOT_CPU "${CMAKE_SOURCE_DIR}/apps/cpu/")
+include(${APPS_ROOT_CPU}/Applications.cmake)
\ No newline at end of file

cpu/Applications/Applications.cmake → apps/cpu/Applications.cmake

@@ -12,7 +12,7 @@
 # add_subdirectory(Applications/plate)
 # add_subdirectory(Applications/plate2)
 ##add_subdirectory(Applications/FlowAroundCylinder)
-add_subdirectory(Applications/LaminarTubeFlow)
+add_subdirectory(${APPS_ROOT_CPU}/LaminarTubeFlow)
 # add_subdirectory(Applications/LaminarTubeFlowConv)
 #add_subdirectory(Applications/cylinderSt)
 #add_subdirectory(Applications/mpichTest)