Small CMake Fixes. cpu and gpu made use of same basics source code.

CMake/FileUtilities.cmake

@@ -109,7 +109,7 @@ macro(generateExportHeader libName)
 		GENERATE_EXPORT_HEADER	(${libName}
 				#BASE_NAME ${libName}
 				#EXPORT_MACRO_NAME ${libName}_EXPORT
-				EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/${libName}_export.h
+				EXPORT_FILE_NAME ${CMAKE_BINARY_DIR}/${libName}_export.h
 				#STATIC_DEFINE ${libName}_BUILT_AS_STATIC
 				)
 	#endif()

CMake/VirtualFluidsMacros.cmake

@@ -165,8 +165,10 @@ function(vf_add_library)
     MESSAGE(STATUS "configuring ${library_name} (type=${ARG_BUILDTYPE})... done")
 
     if (NOT ${ARG_BUILDTYPE} MATCHES binary)
-    generateExportHeader (${library_name})
-        endif()
+      generateExportHeader (${library_name})
+    endif()
+
+    target_include_directories(${library_name} PRIVATE ${CMAKE_BINARY_DIR})
 
 endfunction(vf_add_library)
 

cpu/Applications/IncludsList.cmake

 INCLUDE_DIRECTORIES(${APPS_ROOT})
-INCLUDE(${SOURCE_DIR}/VirtualFluidsBasic/IncludsList.cmake)
 INCLUDE(${SOURCE_DIR}/VirtualFluidsCore/IncludsList.cmake)
+
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/numerics/geometry3d)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/numerics/geometry3d/Creator)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/numerics/geometry3d/KdTree)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/basics/container)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/basics/memory)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/basics/objects)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/basics/transmiitter)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/basics/utilities)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/basics/writer)
\ No newline at end of file

cpu/VirtualFluidsCore/CMakeLists.txt

@@ -98,13 +98,13 @@ include (${CMAKE_SOURCE_DIR}/CMake/VirtualFluidsMacros.cmake)
 vf_add_library(BUILDTYPE static DEPENDS basics MuParser ${MPI_LIBRARY})
 
 vf_get_library_name(library_name)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/numerics/geometry3d)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/numerics/geometry3d/Creator)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/numerics/geometry3d/KdTree)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/basics/container)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/basics/memory)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/basics/objects)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/basics/transmiitter)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/basics/utilities)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/basics/writer)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/numerics/geometry3d)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/numerics/geometry3d/Creator)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/numerics/geometry3d/KdTree)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/basics/container)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/basics/memory)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/basics/objects)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/basics/transmiitter)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/basics/utilities)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/basics/writer)

src/basics/basics/container/CbArray4D.h

@@ -32,7 +32,7 @@
 #include <typeinfo>
 #include "PointerDefinitions.h"
 
-#include "basics_export"
+#include "basics_export.h"
 
 #ifdef CAB_RCF
    #include <3rdParty/rcf/RcfSerializationIncludes.h>