Merge branch 'feature/build_fix' into develop

* feature/build_fix:
  Remove unused stuff and the global include from VirtualFluidsDefinition.h. Adds missing export includes.

gpu.cmake

@@ -101,11 +101,6 @@ enable_language(CUDA)
 
 include(${CMAKE_PATH}/CMakeMacros_old/general/FindCompiler.cmake)
 configure_file(src/gpu/VirtualFluidsDefinitions.in.h VirtualFluidsDefinitions.h)
-if(MSVC)
-    SET( CMAKE_CXX_FLAGS "/FI${CMAKE_BINARY_DIR}/VirtualFluidsDefinitions.h ${CMAKE_CXX_FLAGS}" )
-ELSE(MSVC)
-    SET( CMAKE_CXX_FLAGS "-include ${CMAKE_BINARY_DIR}/VirtualFluidsDefinitions.h ${CMAKE_CXX_FLAGS}" )
-ENDIF(MSVC)
 
 IF( VF.BUILD_VF_GKS )
     # only use this with device of CC larger than 6.0

src/basics/CMakeLists.txt

@@ -19,9 +19,7 @@ include(Core/buildInfo.cmake)
 INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/VirtualFluidsCore)
 INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
 
-IF(MSVC)
-    add_compile_definitions(NOMINMAX)                # Disable Min/Max-Macros
-ENDIF(MSVC)
+
 
 vf_add_library(BUILDTYPE static
                FOLDER
@@ -52,6 +50,10 @@ vf_get_library_name (library_name)
 target_include_directories(${library_name} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/Core)
 target_include_directories(${library_name} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 
+IF(MSVC)
+    target_compile_definitions(${library_name} PUBLIC NOMINMAX) # Disable Min/Max-Macros
+ENDIF(MSVC)
+
 include (${CMAKE_PATH}/3rd/mpi.cmake)
 
 vf_add_tests()
\ No newline at end of file

src/basics/Core/DataTypes.h

@@ -3,7 +3,7 @@
 
 #include <string>
 
-//#include "VirtualFluidsDefinitions.h"
+#include "VirtualFluidsDefinitions.h"
 
 #ifdef VF_DOUBLE_ACCURACY
 typedef double real;

src/basics/Core/RealConstants.h

 #ifndef REAL_CONSTANT_H
 #define REAL_CONSTANT_H
 
-//#include "VirtualFluidsDefinitions.h"
+#include "VirtualFluidsDefinitions.h"
 
 #ifdef VF_DOUBLE_ACCURACY
 #define c1o2		0.5

src/gpu/GridGenerator/utilities/math/Math.cu

@@ -2,6 +2,8 @@
 
 #include <cmath>
 
+#include "VirtualFluidsDefinitions.h"
+
 HOSTDEVICE bool vf::Math::equal(const real& val1, const real& val2, real maxRelDiff)
 {
 	const real diff = std::fabs(val1 - val2);

src/gpu/Traffic/GPU/TrafficTimestep.h

@@ -10,13 +10,14 @@
 #include <VirtualFluidsDefinitions.h>
 #include "Core/PointerDefinitions.h"
 #include "Core/DataTypes.h"
+#include "Traffic_export.h"
 
 struct RoadNetworkData;
 class Sink;
 class Junction;
 class Source;
 
-class VIRTUALFLUIDS_GPU_EXPORT TrafficTimestep
+class TRAFFIC_EXPORT TrafficTimestep
 {
 private:
 

src/gpu/Traffic/Junction/Junction.h

@@ -5,10 +5,11 @@
 #include "Core/DataTypes.h"
 
 #include "JunctionData.h"
+#include "Traffic_export.h"
 
 class TrafficMovement;
 
-class VIRTUALFLUIDS_GPU_EXPORT Junction
+class TRAFFIC_EXPORT Junction
 {
 public:
 	virtual void checkOutCellIndices(const uint roadLength) const = 0;

src/gpu/Traffic/Junction/JunctionData.h

@@ -5,9 +5,10 @@
 #include <memory>
 
 #include "Utilities/RandomHelper.h"
+#include "Traffic_export.h"
 
 
-struct VIRTUALFLUIDS_GPU_EXPORT JunctionData
+struct TRAFFIC_EXPORT JunctionData
 {
 public:
 	std::vector<uint> inCellIndices;

src/gpu/Traffic/Junction/JunctionRandom.h

@@ -6,10 +6,11 @@
 #include "Core/DataTypes.h"
 
 #include "Junction.h"
+#include "Traffic_export.h"
 
 class TrafficMovement;
 
-class VIRTUALFLUIDS_GPU_EXPORT JunctionRandom :
+class TRAFFIC_EXPORT JunctionRandom :
 	public Junction
 {
 

src/gpu/Traffic/Output/CarDisplay.h

@@ -8,8 +8,10 @@
 #include "Source/Source.h"
 #include "Junction/Junction.h"
 
+#include "Traffic_export.h"
 
-class VIRTUALFLUIDS_GPU_EXPORT CarDisplay {
+
+class TRAFFIC_EXPORT CarDisplay {
 public:
 	CarDisplay(std::vector<int> **pcurrent, const uint safetyDistance);
 	~CarDisplay() {};

src/gpu/Traffic/Output/ConcBySpeedAndAcceleration.h

@@ -2,7 +2,9 @@
 
 #include "ConcentrationOutwriter.h"
 
-class VIRTUALFLUIDS_GPU_EXPORT ConcBySpeedAndAcceleration :
+#include "Traffic_export.h"
+
+class TRAFFIC_EXPORT ConcBySpeedAndAcceleration :
 	public ConcentrationOutwriter
 {
 public:

src/gpu/Traffic/Output/ConcentrationByPosition.h

@@ -2,7 +2,9 @@
 
 #include "ConcentrationOutwriter.h"
 
-class VIRTUALFLUIDS_GPU_EXPORT ConcentrationByPosition:
+#include "Traffic_export.h"
+
+class TRAFFIC_EXPORT ConcentrationByPosition:
 	public ConcentrationOutwriter
 {
 public:

src/gpu/Traffic/Output/ConcentrationOutwriter.h

@@ -5,7 +5,9 @@
 #include <VirtualFluidsDefinitions.h>
 #include "Core/DataTypes.h"
 
-class VIRTUALFLUIDS_GPU_EXPORT ConcentrationOutwriter
+#include "Traffic_export.h"
+
+class TRAFFIC_EXPORT ConcentrationOutwriter
 {
 public:
 	virtual void resetConcentrations();

src/gpu/Traffic/RoadNetwork/RoadMaker.h

@@ -5,8 +5,10 @@
 
 #include "Utilities/RandomHelper.h"
 
+#include "Traffic_export.h"
 
-struct VIRTUALFLUIDS_GPU_EXPORT RoadMaker :
+
+struct TRAFFIC_EXPORT RoadMaker :
 	public RoadNetworkData
 {
 public:

src/gpu/Traffic/RoadNetwork/RoadNetworkData.h

@@ -8,8 +8,10 @@
 #include "Sink/Sink.h"
 #include "Junction/Junction.h"
 
+#include "Traffic_export.h"
 
-struct VIRTUALFLUIDS_GPU_EXPORT RoadNetworkData
+
+struct TRAFFIC_EXPORT RoadNetworkData
 {
 protected:
 	friend class TrafficMovement;

src/gpu/Traffic/Sink/Sink.h

@@ -2,7 +2,9 @@
 
 #include "SinkData.h"
 
-class VIRTUALFLUIDS_GPU_EXPORT Sink
+#include "Traffic_export.h"
+
+class TRAFFIC_EXPORT Sink
 {
 public:
 	virtual real getPossibilityBeingBlocked() const = 0;

src/gpu/Traffic/Sink/SinkData.h

@@ -3,7 +3,9 @@
 #include <VirtualFluidsDefinitions.h>
 #include "Core/DataTypes.h"
 
-struct VIRTUALFLUIDS_GPU_EXPORT SinkData {
+#include "Traffic_export.h"
+
+struct TRAFFIC_EXPORT SinkData {
 	uint sinkIndex;
 	real sinkBlockedPossibility;
 };
\ No newline at end of file

src/gpu/Traffic/Sink/SinkRandom.h

@@ -7,7 +7,9 @@
 
 #include "Utilities/RandomHelper.h"
 
-class VIRTUALFLUIDS_GPU_EXPORT SinkRandom:
+#include "Traffic_export.h"
+
+class TRAFFIC_EXPORT SinkRandom:
 	public Sink
 {
 private:

src/gpu/Traffic/Source/Source.h

@@ -2,8 +2,9 @@
 #include <VirtualFluidsDefinitions.h>
 
 #include "SourceData.h"
+#include "Traffic_export.h"
 
-class VIRTUALFLUIDS_GPU_EXPORT Source
+class TRAFFIC_EXPORT Source
 {
 public:
 	virtual uint getIndex() const = 0;

src/gpu/Traffic/Source/SourceData.h

@@ -4,9 +4,10 @@
 
 #include <memory>
 #include <vector>
+#include "Traffic_export.h"
 
 
-struct VIRTUALFLUIDS_GPU_EXPORT SourceData {
+struct TRAFFIC_EXPORT SourceData {
 	uint sourceIndex;
 	real sourcePossibility;
 	uint maxVelocity;