Merge branch 'feature/fix_vf_definitions' into develop

* feature/fix_vf_definitions:
  Move VirtualFluidsDefinition into basics.

# Conflicts:
#	gpu.cmake

CMakeLists.txt

@@ -50,6 +50,8 @@ include("${CMAKE_PATH}/CMakeCABMacros.cmake")
 include("${CMAKE_PATH}/FileUtilities.cmake")
 include("${CMAKE_PATH}/VirtualFluidsMacros.cmake")
 
+include(${CMAKE_PATH}/CMakeMacros_old/general/FindCompiler.cmake)
+configure_file(src/basics/VirtualFluidsDefinitions.in.h VirtualFluidsDefinitions.h)
 
 #################################################################################
 #  COMMON LIBRARIES

gpu.cmake

@@ -99,9 +99,6 @@ enable_language(CUDA)
 
 #############################################################
 
-include(${CMAKE_PATH}/CMakeMacros_old/general/FindCompiler.cmake)
-configure_file(src/gpu/VirtualFluidsDefinitions.in.h VirtualFluidsDefinitions.h)
-
 IF( VF.BUILD_VF_GKS )
     # only use this with device of CC larger than 6.0
     set(CMAKE_CUDA_FLAGS " -arch=sm_60 -Xptxas=\"-v\"" CACHE STRING "" FORCE)