Removed old export include header. Little clean up in cmake.

CMakeLists.txt

@@ -27,17 +27,18 @@ set(appFolder     "apps")
 #  OPTIONS
 #################################################################################
 option(BUILD_VF_CPU "Build VirtualFluids cpu variant" OFF)
-option(BUILD_VF_GPU "Build VirtualFluids gpu variant" ON)
+option(BUILD_VF_GPU "Build VirtualFluids gpu variant" OFF)
 option(BUILD_VF_UNIT_TESTS "Build VirtualFluids unit tests" ON)
 
 #################################################################################
 #  MACROS
 #################################################################################
+include(CMakePrintHelpers)
 set (CMAKE_PATH "${CMAKE_SOURCE_DIR}/CMake")
 include("${CMAKE_PATH}/CMakeCABMacros.cmake")
 include("${CMAKE_PATH}/FileUtilities.cmake")
 include("${CMAKE_PATH}/VirtualFluidsMacros.cmake")
-include(CMakePrintHelpers)
+
 
 #################################################################################
 #  COMMON LIBRARIES
@@ -47,10 +48,10 @@ add_subdirectory(src/basics)
 #################################################################################
 #  VIRTUAL FLUIDS CPU / GPU
 #################################################################################
-#if (BUILD_VF_CPU)
-include (cpu.cmake)
-#endif()
-#if(BUILD_VF_GPU)
-#include (gpu.cmake)
-#endif()
+if (BUILD_VF_CPU)
+    include (cpu.cmake)
+endif()
+if(BUILD_VF_GPU)
+    include (gpu.cmake)
+endif()
 

cpu.cmake

@@ -21,7 +21,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
 
 PROJECT(VirtualFluids)
 set (SOURCE_DIR ${PROJECT_SOURCE_DIR})
-set(SOURCE_ROOT "../source")
+set(SOURCE_ROOT ${CMAKE_SOURCE_DIR})
 
 #debug build for unix
 #IF(UNIX)
@@ -37,14 +37,15 @@ 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_GCC OFF CACHE BOOL "include gcc compiler support") #TODO: why do we need to set this manually?
 SET(USE_HLRN_LUSTRE OFF CACHE BOOL "include HLRN Lustre support")
 SET(USE_DEM_COUPLING OFF CACHE BOOL "PE plugin")
 
+
 #CAB
-include("CMake/CMakeCABMacros.cmake")
-include("CMake/FileUtilities.cmake")
-include("CMake/VirtualFluidsMacros.cmake")
+include("CMake/CMakeCABMacros.cmake") #TODO: Currently we have to include the CABMacros also here, so that the USE_* are defined in the config files for the cpu version
+#include("CMake/FileUtilities.cmake")
+#include("CMake/VirtualFluidsMacros.cmake")
 
 #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)

src/basics/Core/Timer/Timer.h

 #ifndef TIMER_H
 #define TIMER_H
 
-#include "VirtualFluidsDefinitions.h"
+//#include "VirtualFluidsDefinitions.h"
 #include "basics_export.h"
 
 #include "DataTypes.h"

src/basics/Core/Timer/TimerImp.h

@@ -5,7 +5,7 @@
 
 #include <chrono>
 
-#include "VirtualFluidsDefinitions.h"
+//#include "VirtualFluidsDefinitions.h"
 
 #include "DataTypes.h"