From e2eda8fed6f1dd7046818c07407124eaf150d2a8 Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Wed, 16 Sep 2020 16:33:38 +0200
Subject: [PATCH] Remove old cmake macros. Remove VirtualFluidsDefinitions.h
header file. Remove redundant compiler definitions from gpu.cmake.
---
CMake/CMakeMacros_old/Cocoa/Link.cmake | 4 -
.../Environment/environment.cmake | 5 -
CMake/CMakeMacros_old/GMock/FindGMock.cmake | 137 ------------------
CMake/CMakeMacros_old/GMock/Link.cmake | 11 --
.../CMakeMacros_old/JsonCpp/FindJsonCpp.cmake | 28 ----
CMake/CMakeMacros_old/JsonCpp/Link.cmake | 6 -
CMake/CMakeMacros_old/MacOSXBundle/Info.plist | 14 --
.../MacOSXBundle/MacOSXBundle.cmake | 6 -
CMake/CMakeMacros_old/MathLink/Link.cmake | 7 -
CMake/CMakeMacros_old/Metis/FindMetis.cmake | 102 -------------
CMake/CMakeMacros_old/Metis/Link.cmake | 6 -
CMake/CMakeMacros_old/Qt/Link.cmake | 24 ---
CMake/CMakeMacros_old/README.md | 22 ---
CMake/CMakeMacros_old/VTK/Link.cmake | 8 -
CMake/CMakeMacros_old/fftw/FindFftw.cmake | 29 ----
CMake/CMakeMacros_old/fftw/Link.cmake | 7 -
.../CMakeMacros_old/general/BuildTarget.cmake | 56 -------
.../general/BuildTargetUtilities.cmake | 54 -------
.../general/EndingsToCollect.cmake | 36 -----
.../general/FileUtilities.cmake | 109 --------------
.../general/FindCompiler.cmake | 92 ------------
CMake/VirtualFluidsMacros.cmake | 2 +
CMake/compilerflags/MSVC.cmake | 11 +-
CMakeLists.txt | 3 -
gpu.cmake | 10 +-
src/basics/Core/DataTypes.h | 2 +-
src/basics/Core/RealConstants.h | 2 +-
src/basics/Core/Timer/Timer.h | 2 +-
src/basics/Core/Timer/TimerImp.h | 2 +-
src/basics/VirtualFluidsDefinitions.in.h | 26 ----
src/gpu/GksGpu/Analyzer/ConvergenceAnalyzer.h | 2 +-
src/gpu/GksGpu/Analyzer/CupsAnalyzer.cpp | 2 +-
src/gpu/GksGpu/Analyzer/CupsAnalyzer.h | 2 +-
src/gpu/GksGpu/Analyzer/EnstrophyAnalyzer.h | 2 +-
src/gpu/GksGpu/Analyzer/HeatFluxAnalyzer.h | 2 +-
.../GksGpu/Analyzer/KineticEnergyAnalyzer.h | 2 +-
.../GksGpu/Analyzer/PointTimeSeriesAnalyzer.h | 2 +-
.../Analyzer/PointTimeSeriesCollector.h | 2 +-
src/gpu/GksGpu/Analyzer/TurbulenceAnalyzer.h | 2 +-
.../GksGpu/BoundaryConditions/AdiabaticWall.h | 2 +-
.../BoundaryConditions/BoundaryCondition.h | 2 +-
.../BoundaryConditions/ConcreteHeatFlux.h | 2 +-
.../BoundaryConditions/CreepingMassFlux.h | 2 +-
.../GksGpu/BoundaryConditions/Extrapolation.h | 2 +-
src/gpu/GksGpu/BoundaryConditions/HeatFlux.h | 2 +-
src/gpu/GksGpu/BoundaryConditions/Inflow.h | 2 +-
.../BoundaryConditions/InflowComplete.h | 2 +-
.../BoundaryConditions/IsothermalWall.h | 2 +-
.../BoundaryConditions/MassCompensation.h | 2 +-
src/gpu/GksGpu/BoundaryConditions/Open.h | 2 +-
.../PassiveScalarDiriclet.h | 2 +-
src/gpu/GksGpu/BoundaryConditions/Periodic.h | 2 +-
src/gpu/GksGpu/BoundaryConditions/Pressure.h | 2 +-
src/gpu/GksGpu/BoundaryConditions/Pressure2.h | 2 +-
.../BoundaryConditions/SalinasVazquez.h | 2 +-
src/gpu/GksGpu/BoundaryConditions/Symmetry.h | 2 +-
src/gpu/GksGpu/CellUpdate/CellUpdate.h | 2 +-
src/gpu/GksGpu/Communication/Communicator.h | 2 +-
src/gpu/GksGpu/Communication/MpiUtility.h | 2 +-
src/gpu/GksGpu/CudaUtility/CudaUtility.h | 2 +-
src/gpu/GksGpu/DataBase/DataBase.h | 2 +-
src/gpu/GksGpu/DataBase/DataBaseAllocator.h | 2 +-
.../GksGpu/DataBase/DataBaseAllocatorCPU.h | 2 +-
.../GksGpu/DataBase/DataBaseAllocatorGPU.h | 2 +-
src/gpu/GksGpu/FluxComputation/ApplyFlux.cuh | 2 +-
.../GksGpu/FluxComputation/AssembleFlux.cuh | 2 +-
.../FluxComputation/ExpansionCoefficients.cuh | 2 +-
.../GksGpu/FluxComputation/FluxComputation.h | 2 +-
src/gpu/GksGpu/FluxComputation/Moments.cuh | 2 +-
.../GksGpu/FluxComputation/Reconstruction.cuh | 2 +-
.../GksGpu/FluxComputation/Smagorinsky.cuh | 2 +-
.../GksGpu/FluxComputation/SutherlandsLaw.cuh | 2 +-
.../GksGpu/FluxComputation/Transformation.cuh | 2 +-
src/gpu/GksGpu/Initializer/Initializer.h | 2 +-
src/gpu/GksGpu/Interface/Interface.h | 2 +-
src/gpu/GksGpu/TimeStepping/NestedTimeStep.h | 2 +-
src/gpu/GksMeshAdapter/GksMeshAdapter.h | 2 +-
src/gpu/GksVtkAdapter/VTKAdapter.h | 2 +-
src/gpu/GksVtkAdapter/VTKInterface.h | 2 +-
src/gpu/GridGenerator/global.h | 2 +-
src/gpu/GridGenerator/utilities/math/Math.cu | 2 +-
.../VirtualFluids_GPU/GPU/EnstrophyAnalyzer.h | 2 +-
.../GPU/KineticEnergyAnalyzer.h | 2 +-
.../VirtualFluids_GPU/Parameter/Parameter.h | 2 +-
84 files changed, 68 insertions(+), 863 deletions(-)
delete mode 100644 CMake/CMakeMacros_old/Cocoa/Link.cmake
delete mode 100644 CMake/CMakeMacros_old/Environment/environment.cmake
delete mode 100644 CMake/CMakeMacros_old/GMock/FindGMock.cmake
delete mode 100644 CMake/CMakeMacros_old/GMock/Link.cmake
delete mode 100644 CMake/CMakeMacros_old/JsonCpp/FindJsonCpp.cmake
delete mode 100644 CMake/CMakeMacros_old/JsonCpp/Link.cmake
delete mode 100644 CMake/CMakeMacros_old/MacOSXBundle/Info.plist
delete mode 100644 CMake/CMakeMacros_old/MacOSXBundle/MacOSXBundle.cmake
delete mode 100644 CMake/CMakeMacros_old/MathLink/Link.cmake
delete mode 100644 CMake/CMakeMacros_old/Metis/FindMetis.cmake
delete mode 100644 CMake/CMakeMacros_old/Metis/Link.cmake
delete mode 100644 CMake/CMakeMacros_old/Qt/Link.cmake
delete mode 100644 CMake/CMakeMacros_old/README.md
delete mode 100644 CMake/CMakeMacros_old/VTK/Link.cmake
delete mode 100644 CMake/CMakeMacros_old/fftw/FindFftw.cmake
delete mode 100644 CMake/CMakeMacros_old/fftw/Link.cmake
delete mode 100644 CMake/CMakeMacros_old/general/BuildTarget.cmake
delete mode 100644 CMake/CMakeMacros_old/general/BuildTargetUtilities.cmake
delete mode 100644 CMake/CMakeMacros_old/general/EndingsToCollect.cmake
delete mode 100644 CMake/CMakeMacros_old/general/FileUtilities.cmake
delete mode 100644 CMake/CMakeMacros_old/general/FindCompiler.cmake
delete mode 100644 src/basics/VirtualFluidsDefinitions.in.h
diff --git a/CMake/CMakeMacros_old/Cocoa/Link.cmake b/CMake/CMakeMacros_old/Cocoa/Link.cmake
deleted file mode 100644
index de9f2cd89..000000000
--- a/CMake/CMakeMacros_old/Cocoa/Link.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-macro(linkCocoa targetName)
- find_library(COCOA_LIB Cocoa)
- target_link_libraries(${targetName} ${COCOA_LIB})
-endmacro(linkCocoa)
diff --git a/CMake/CMakeMacros_old/Environment/environment.cmake b/CMake/CMakeMacros_old/Environment/environment.cmake
deleted file mode 100644
index 2c33e5cc2..000000000
--- a/CMake/CMakeMacros_old/Environment/environment.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-unset(BUILD_computerName)
-site_name(BUILD_computerName)
-MESSAGE(STATUS "computer name: " ${BUILD_computerName})
-
-include(${CMAKE_SOURCE_DIR}/MachineFiles/${BUILD_computerName})
\ No newline at end of file
diff --git a/CMake/CMakeMacros_old/GMock/FindGMock.cmake b/CMake/CMakeMacros_old/GMock/FindGMock.cmake
deleted file mode 100644
index 4ae3b599c..000000000
--- a/CMake/CMakeMacros_old/GMock/FindGMock.cmake
+++ /dev/null
@@ -1,137 +0,0 @@
-# Locate the Google C++ Mocking Framework.
-# (This file is almost an identical copy of the original FindGTest.cmake file,
-# feel free to use it as it is or modify it for your own needs.)
-#
-#
-# Defines the following variables:
-#
-# GMOCK_FOUND - Found the Google Testing framework
-# GMOCK_INCLUDE_DIRS - Include directories
-#
-# Also defines the library variables below as normal
-# variables. These contain debug/optimized keywords when
-# a debugging library is found.
-#
-# GMOCK_BOTH_LIBRARIES - Both libgmock & libgmock-main
-# GMOCK_LIBRARIES - libgmock
-# GMOCK_MAIN_LIBRARIES - libgmock-main
-#
-# Accepts the following variables as input:
-#
-# GMOCK_HOME - (as a CMake or environment variable)
-# The root directory of the gmock install prefix
-#
-# GMOCK_MSVC_SEARCH - If compiling with MSVC, this variable can be set to
-# "MD" or "MT" to enable searching a gmock build tree
-# (defaults: "MD")
-#
-#-----------------------
-# Example Usage:
-#
-# find_package(GMock REQUIRED)
-# include_directories(${GMOCK_INCLUDE_DIRS})
-#
-# add_executable(foo foo.cc)
-# target_link_libraries(foo ${GMOCK_BOTH_LIBRARIES})
-#
-#=============================================================================
-# This file is released under the MIT licence:
-#
-# Copyright (c) 2011 Matej Svec
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-#=============================================================================
-
-
-function(_gmock_append_debugs _endvar _library)
- if(${_library} AND ${_library}_DEBUG)
- set(_output optimized ${${_library}} debug ${${_library}_DEBUG})
- else()
- set(_output ${${_library}})
- endif()
- set(${_endvar} ${_output} PARENT_SCOPE)
-endfunction()
-
-function(_gmock_find_library _name)
- find_library(${_name}
- NAMES ${ARGN}
- HINTS
- $ENV{GMOCK_HOME}
- ${GMOCK_LIBRARIES_PATH}
- )
- mark_as_advanced(${_name})
-endfunction()
-
-
-if(NOT DEFINED GMOCK_MSVC_SEARCH)
- set(GMOCK_MSVC_SEARCH MD)
-endif()
-
-set(_gmock_libpath_suffixes lib)
-if(MSVC)
- if(GMOCK_MSVC_SEARCH STREQUAL "MD")
- list(APPEND _gmock_libpath_suffixes
- msvc/googlemock/Debug
- msvc/googlemock/Release)
- elseif(GMOCK_MSVC_SEARCH STREQUAL "MT")
- list(APPEND _gmock_libpath_suffixes
- msvc/googlemock/Debug
- msvc/googlemock/Release)
- endif()
-elseif(APPLE)
- list(APPEND _gmock_libpath_suffixes
- clang/googlemock)
-endif()
-
-find_path(GMOCK_INCLUDE_DIR gmock/gmock.h
- HINTS
- ${GMOCK_ROOT}/googlemock/include
-)
-
-find_path(GMOCK_GTEST_INCLUDE_DIR gtest/gtest.h
- HINTS
- ${GMOCK_ROOT}/googletest/include
-)
-
-mark_as_advanced(GMOCK_GTEST_INCLUDE_DIR)
-mark_as_advanced(GMOCK_INCLUDE_DIR)
-
-if(MSVC AND GMOCK_MSVC_SEARCH STREQUAL "MD")
- # The provided /MD project files for Google Mock add -md suffixes to the
- # library names.
- _gmock_find_library(GMOCK_LIBRARY gmock-md gmock)
- _gmock_find_library(GMOCK_LIBRARY_DEBUG gmock-mdd gmockd)
- _gmock_find_library(GMOCK_MAIN_LIBRARY gmock_main-md gmock_main)
- _gmock_find_library(GMOCK_MAIN_LIBRARY_DEBUG gmock_main-mdd gmock_maind)
-else()
- _gmock_find_library(GMOCK_LIBRARY gmock)
- _gmock_find_library(GMOCK_LIBRARY_DEBUG gmockd)
- _gmock_find_library(GMOCK_MAIN_LIBRARY gmock_main)
- _gmock_find_library(GMOCK_MAIN_LIBRARY_DEBUG gmock_maind)
-endif()
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMock DEFAULT_MSG GMOCK_LIBRARY GMOCK_INCLUDE_DIR GMOCK_MAIN_LIBRARY)
-
-if(GMOCK_FOUND)
- set(GMOCK_INCLUDE_DIRS ${GMOCK_INCLUDE_DIR})
- _gmock_append_debugs(GMOCK_LIBRARIES GMOCK_LIBRARY)
- _gmock_append_debugs(GMOCK_MAIN_LIBRARIES GMOCK_MAIN_LIBRARY)
- set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARIES} ${GMOCK_MAIN_LIBRARIES})
-endif()
diff --git a/CMake/CMakeMacros_old/GMock/Link.cmake b/CMake/CMakeMacros_old/GMock/Link.cmake
deleted file mode 100644
index 14b3300e5..000000000
--- a/CMake/CMakeMacros_old/GMock/Link.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-macro(linkGMock targetName)
- if(BUILD_SHARED_LIBS)
- add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY)
- endif()
-
-
- target_include_directories(${targetName} PRIVATE ${GMOCK_ROOT}/googlemock/include)
- target_include_directories(${targetName} PRIVATE ${GMOCK_ROOT}/googletest/include)
-
- target_link_libraries(${targetName} gmock gmock_main)
-endmacro(linkGMock)
diff --git a/CMake/CMakeMacros_old/JsonCpp/FindJsonCpp.cmake b/CMake/CMakeMacros_old/JsonCpp/FindJsonCpp.cmake
deleted file mode 100644
index a5ab3088f..000000000
--- a/CMake/CMakeMacros_old/JsonCpp/FindJsonCpp.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-
-find_path(JSONCPP_INCLUDE_DIRS json/json.h
- HINTS ${JSONCPP_ROOT} ENV JSONCPP_ROOT
- PATH_SUFFIXES include
- DOC "Directory where the JSONCPP header files are located"
-)
-
-
-
-find_library(JSONCPP_LIBRARIES
- NAMES jsoncpp.lib
- HINTS ${JSONCPP_LIBRARIES_PATH}
- DOC "Directory where the JSONCPP library is located"
-)
-
-
-# Standard package handling
-include(FindPackageHandleStandardArgs)
-if(CMAKE_VERSION VERSION_GREATER 2.8.2)
- find_package_handle_standard_args(JSONCPP
- REQUIRED_VARS JSONCPP_INCLUDE_DIRS JSONCPP_LIBRARIES)
-else()
- find_package_handle_standard_args(JSONCPP
- REQUIRED_VARS JSONCPP_INCLUDE_DIRS JSONCPP_LIBRARIES)
-endif()
-
-
-mark_as_advanced(JSONCPP_INCLUDE_DIRS JSONCPP_LIBRARIES)
\ No newline at end of file
diff --git a/CMake/CMakeMacros_old/JsonCpp/Link.cmake b/CMake/CMakeMacros_old/JsonCpp/Link.cmake
deleted file mode 100644
index 3295ab1e7..000000000
--- a/CMake/CMakeMacros_old/JsonCpp/Link.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-macro(linkJsonCpp targetName)
-
- target_include_directories(${targetName} PUBLIC ${JSONCPP_ROOT}/include)
- target_link_libraries(${targetName} jsoncpp)
-
-endmacro(linkJsonCpp)
diff --git a/CMake/CMakeMacros_old/MacOSXBundle/Info.plist b/CMake/CMakeMacros_old/MacOSXBundle/Info.plist
deleted file mode 100644
index 51f91e9ed..000000000
--- a/CMake/CMakeMacros_old/MacOSXBundle/Info.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleExecutable</key>
- <string>${targetName}</string>
- <key>CFBundleName</key>
- <string>${targetName}</string>
- <key>NSPrincipalClass</key>
- <string>NSApplication</string>
-</dict>
-</plist>
diff --git a/CMake/CMakeMacros_old/MacOSXBundle/MacOSXBundle.cmake b/CMake/CMakeMacros_old/MacOSXBundle/MacOSXBundle.cmake
deleted file mode 100644
index 981b8697a..000000000
--- a/CMake/CMakeMacros_old/MacOSXBundle/MacOSXBundle.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-macro(bundleTargetForMacOSX targetName)
-
- set_target_properties(${targetName} PROPERTIES MACOSX_BUNDLE ON)
- set_target_properties(${targetName} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/cmake/MacOSXBundle/Info.plist)
-
-endmacro(bundleTargetForMacOSX)
\ No newline at end of file
diff --git a/CMake/CMakeMacros_old/MathLink/Link.cmake b/CMake/CMakeMacros_old/MathLink/Link.cmake
deleted file mode 100644
index ca929fe98..000000000
--- a/CMake/CMakeMacros_old/MathLink/Link.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-
-macro(linkMathLink targetName)
-
- include_directories(${MATHLINK_ROOT})
- target_link_libraries(${targetName} ${MATHLINK_ROOT}\\wstp64i4.lib)
-
-endmacro(linkMathLink)
\ No newline at end of file
diff --git a/CMake/CMakeMacros_old/Metis/FindMetis.cmake b/CMake/CMakeMacros_old/Metis/FindMetis.cmake
deleted file mode 100644
index b6c539da2..000000000
--- a/CMake/CMakeMacros_old/Metis/FindMetis.cmake
+++ /dev/null
@@ -1,102 +0,0 @@
-# - Try to find METIS
-# Once done this will define
-#
-# METIS_FOUND - system has METIS
-# METIS_INCLUDE_DIRS - include directories for METIS
-# METIS_LIBRARIES - libraries for METIS
-#
-# Variables used by this module. They can change the default behaviour and
-# need to be set before calling find_package:
-#
-# METIS_DIR - Prefix directory of the METIS installation
-# METIS_INCLUDE_DIR - Include directory of the METIS installation
-# (set only if different from ${METIS_DIR}/include)
-# METIS_LIB_DIR - Library directory of the METIS installation
-# (set only if different from ${METIS_DIR}/lib)
-# METIS_TEST_RUNS - Skip tests building and running a test
-# executable linked against METIS libraries
-# METIS_LIB_SUFFIX - Also search for non-standard library names with the
-# given suffix appended
-#
-# NOTE: This file was modified from a ParMETIS detection script
-
-#=============================================================================
-# Copyright (C) 2015 Jack Poulson. All rights reserved.
-#
-# Copyright (C) 2010-2012 Garth N. Wells, Anders Logg, Johannes Ring
-# and Florian Rathgeber. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#=============================================================================
-
-if(NOT METIS_INCLUDE_DIR)
- find_path(METIS_INCLUDE_DIR metis.h
- HINTS ${METIS_ROOT} ENV METIS_ROOT
- PATH_SUFFIXES include
- DOC "Directory where the METIS header files are located"
- )
-endif()
-
-if(NOT METIS_LIBRARY)
- find_library(METIS_LIBRARY
- NAMES metis metis${METIS_LIB_SUFFIX}
- HINTS ${METIS_LIBRARIES_PATH}
- DOC "Directory where the METIS library is located"
- )
-endif()
-
-# Get METIS version
-if(NOT METIS_VERSION_STRING AND METIS_INCLUDE_DIR AND EXISTS "${METIS_INCLUDE_DIR}/metis.h")
- set(version_pattern "^#define[\t ]+METIS_(MAJOR|MINOR)_VERSION[\t ]+([0-9\\.]+)$")
- file(STRINGS "${METIS_INCLUDE_DIR}/metis.h" metis_version REGEX ${version_pattern})
-
- foreach(match ${metis_version})
- if(METIS_VERSION_STRING)
- set(METIS_VERSION_STRING "${METIS_VERSION_STRING}.")
- endif()
- string(REGEX REPLACE ${version_pattern} "${METIS_VERSION_STRING}\\2" METIS_VERSION_STRING ${match})
- set(METIS_VERSION_${CMAKE_MATCH_1} ${CMAKE_MATCH_2})
- endforeach()
- unset(metis_version)
- unset(version_pattern)
-endif()
-
-# Standard package handling
-include(FindPackageHandleStandardArgs)
-if(CMAKE_VERSION VERSION_GREATER 2.8.2)
- find_package_handle_standard_args(METIS
- REQUIRED_VARS METIS_LIBRARY METIS_INCLUDE_DIR
- VERSION_VAR METIS_VERSION_STRING)
-else()
- find_package_handle_standard_args(METIS
- REQUIRED_VARS METIS_LIBRARY METIS_INCLUDE_DIR)
-endif()
-
-if(METIS_FOUND)
- set(METIS_LIBRARIES ${METIS_LIBRARY})
- set(METIS_INCLUDE_DIRS ${METIS_INCLUDE_DIR})
-endif()
-
-mark_as_advanced(METIS_INCLUDE_DIR METIS_LIBRARY)
\ No newline at end of file
diff --git a/CMake/CMakeMacros_old/Metis/Link.cmake b/CMake/CMakeMacros_old/Metis/Link.cmake
deleted file mode 100644
index fefa25569..000000000
--- a/CMake/CMakeMacros_old/Metis/Link.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-macro(linkMetis targetName)
-
- include_directories(${METIS_ROOT}/include)
- target_link_libraries(${targetName} metis)
-
-endmacro(linkMetis)
diff --git a/CMake/CMakeMacros_old/Qt/Link.cmake b/CMake/CMakeMacros_old/Qt/Link.cmake
deleted file mode 100644
index d71044563..000000000
--- a/CMake/CMakeMacros_old/Qt/Link.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-macro(linkQt targetName)
-
- find_package(Qt5Core)
- find_package(Qt5Widgets)
- find_package(Qt5Gui)
- find_package(Qt5PrintSupport)
- find_package(Qt5Charts)
-
- include_directories(${QT5Widgets_INCLUDES})
- include_directories(${QT5Core_INCLUDES})
- include_directories(${QT5Gui_INCLUDES})
- include_directories(${QT5PrintSupport_INCLUDES})
-
- add_definitions(${Qt5Widgets_DEFINITIONS})
- add_definitions(${Qt5Core_DEFINITIONS})
- add_definitions(${Qt5Gui_DEFINITIONS})
- add_definitions(${Qt5PrintSupport_DEFINITIONS})
-
- target_link_libraries(${targetName} Qt5::Widgets)
- target_link_libraries(${targetName} Qt5::Core)
- target_link_libraries(${targetName} Qt5::PrintSupport)
- target_link_libraries(${targetName} Qt5::Charts)
-
-endmacro(linkQt)
diff --git a/CMake/CMakeMacros_old/README.md b/CMake/CMakeMacros_old/README.md
deleted file mode 100644
index 6d5da0578..000000000
--- a/CMake/CMakeMacros_old/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# CMake Macros
-
-The cmake macros provide the functionalities for creating targets (executables and libraries), finding files and linking against common libraries.
-
-This repository provides only the macros, which can be integrated in your cmake project as (e.g.) git subtree or just downloaded and copied into the project folder. An usage of this macros with a lot of examples can be found here: [CMake Template on Github](https://github.com/ClubOfDigitalEngineering/CMakeTemplate "CMake Template on Github").
-
-To make it work:
-- copy the file 'Machinefiles/Isildur'
-- rename it to your pc-name (e.g. 'Foos Computer')
-- set the paths to the existing libaries
-
-### The CMake Macros provide macros to link:
-- Boost
-- Cocoa
-- Cuda
-- GoogleMock
-- JsonCpp
-- MPI
-- Metis
-- OpenMP
-- Qt
-- VTK
diff --git a/CMake/CMakeMacros_old/VTK/Link.cmake b/CMake/CMakeMacros_old/VTK/Link.cmake
deleted file mode 100644
index c1fb103c3..000000000
--- a/CMake/CMakeMacros_old/VTK/Link.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-macro(linkVTK targetName)
- find_package(VTK REQUIRED)
-
- include(${VTK_USE_FILE})
- include_directories(${VTK_INCLUDE_DIRS})
-
- target_link_libraries(${targetName} ${VTK_LIBRARIES})
-endmacro(linkVTK)
diff --git a/CMake/CMakeMacros_old/fftw/FindFftw.cmake b/CMake/CMakeMacros_old/fftw/FindFftw.cmake
deleted file mode 100644
index ce84cc9c4..000000000
--- a/CMake/CMakeMacros_old/fftw/FindFftw.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-
-find_path(FFTW_INCLUDE_DIRS fftw3.h
- HINTS ${FFTW_ROOT} ENV FFTW_ROOT
- PATH_SUFFIXES include
- DOC "Directory where the FFTW header files are located"
-)
-
-
-
-find_library(FFTW_LIBRARIES
- NAMES libfftw3-3.lib libfftw3f-3.lib libfftw3l-3.lib
- HINTS ${FFTW_LIBRARIES_PATH}
- DOC "Directory where the FFTW library is located"
-)
-
-
-# Standard package handling
-include(FindPackageHandleStandardArgs)
-if(CMAKE_VERSION VERSION_GREATER 2.8.2)
- find_package_handle_standard_args(FFTW
- REQUIRED_VARS FFTW_INCLUDE_DIRS FFTW_LIBRARIES)
-else()
- find_package_handle_standard_args(FFTW
- REQUIRED_VARS FFTW_INCLUDE_DIRS FFTW_LIBRARIES)
-endif()
-
-
-mark_as_advanced(FFTW_INCLUDE_DIRS FFTW_LIBRARIES)
-
diff --git a/CMake/CMakeMacros_old/fftw/Link.cmake b/CMake/CMakeMacros_old/fftw/Link.cmake
deleted file mode 100644
index 773c45bdf..000000000
--- a/CMake/CMakeMacros_old/fftw/Link.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-
-macro(linkFftw targetName)
-
- include_directories(${FFTW_ROOT}/api)
- target_link_libraries(${targetName} fftw3)
-
-endmacro(linkFftw)
diff --git a/CMake/CMakeMacros_old/general/BuildTarget.cmake b/CMake/CMakeMacros_old/general/BuildTarget.cmake
deleted file mode 100644
index a0ca7bd19..000000000
--- a/CMake/CMakeMacros_old/general/BuildTarget.cmake
+++ /dev/null
@@ -1,56 +0,0 @@
-macro(buildExe targetName sourceFiles linkDirs libsToLink includeDirs)
- setLinkDirectories("${linkDirs}")
-
- message(STATUS "build target: " ${targetName})
- add_executable(${targetName} "${sourceFiles}")
-
- linkLibraries(${targetName} "${libsToLink}")
- setIncludeDirectories(${targetName} "${includeDirs}")
-
-endmacro(buildExe)
-
-macro(buildLib targetName sourceFiles linkDirs libsToLink includeDirs)
- setLinkDirectories("${linkDirs}")
-
- message(STATUS "build target: " ${targetName})
- add_library(${targetName} ${LIB_TYPE} ${sourceFiles})
-
- linkLibraries(${targetName} "${libsToLink}")
- setIncludeDirectories(${targetName} "${includeDirs}")
-
-endmacro(buildLib)
-
-
-macro(setLinkDirectories linkDirs)
- foreach(dir ${linkDirs})
- link_directories(${dir})
- endforeach()
-endmacro(setLinkDirectories)
-
-macro(linkLibraries targetName libsToLink)
- foreach(lib ${libsToLink})
- target_link_libraries(${targetName} ${lib})
- endforeach()
-endmacro(linkLibraries)
-
-macro(setIncludeDirectories targetName includeDirs)
- foreach(dir ${includeDirs})
- target_include_directories(${targetName} PRIVATE ${dir})
- endforeach()
-endmacro(setIncludeDirectories)
-
-include (GenerateExportHeader)
-macro(generateExportHeader libName path)
- if(${BUILD_SHARED_LIBS})
- GENERATE_EXPORT_HEADER (${libName}
- BASE_NAME ${libName}
- EXPORT_MACRO_NAME ${libName}_EXPORT
- EXPORT_FILE_NAME ${path}/${libName}_EXPORT.h
- STATIC_DEFINE ${libName}_BUILT_AS_STATIC
- )
- endif()
-endmacro(generateExportHeader)
-
-macro(groupTarget targetName folderName)
- set_property( TARGET ${targetName} PROPERTY FOLDER ${folderName} )
-endmacro(groupTarget)
\ No newline at end of file
diff --git a/CMake/CMakeMacros_old/general/BuildTargetUtilities.cmake b/CMake/CMakeMacros_old/general/BuildTargetUtilities.cmake
deleted file mode 100644
index 1a30805c4..000000000
--- a/CMake/CMakeMacros_old/general/BuildTargetUtilities.cmake
+++ /dev/null
@@ -1,54 +0,0 @@
-macro(sharedLibs)
- if(${BUILD_SHARED_LIBS})
- set(LIB_TYPE SHARED)
- else()
- set(LIB_TYPE STATIC)
-
- set(CompilerFlags
- CMAKE_CXX_FLAGS
- CMAKE_CXX_FLAGS_DEBUG
- CMAKE_CXX_FLAGS_RELEASE
- CMAKE_C_FLAGS
- CMAKE_C_FLAGS_DEBUG
- CMAKE_C_FLAGS_RELEASE
- )
- foreach(CompilerFlag ${CompilerFlags})
- string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
- endforeach()
-
- set(CompilerFlagsCuda
- CMAKE_CUDA_FLAGS
- CMAKE_CUDA_FLAGS_DEBUG
- CMAKE_CUDA_FLAGS_MINSIZEREL
- CMAKE_CUDA_FLAGS_RELEASE
- CMAKE_CUDA_FLAGS_RELWITHDEBINFO
- )
- foreach(CompilerFlag ${CompilerFlagsCuda})
- string(REPLACE "-MD" "-MT" ${CompilerFlag} "${${CompilerFlag}}")
- endforeach()
- endif()
-endmacro(sharedLibs)
-
-
-
-########################################################################
-# AllTest Option #
-########################################################################
-
-macro(activateAllTestOption)
- set(isAllTestSuite ON)
-endmacro(activateAllTestOption)
-
-
-macro(deactivateAllTestOption)
- set(isAllTestSuite OFF)
-endmacro(deactivateAllTestOption)
-
-
-########################################################################
-# target name #
-########################################################################
-
-macro(setTargetNameToFolderName path)
- get_filename_component(targetName "${path}" NAME)
-endmacro(setTargetNameToFolderName)
\ No newline at end of file
diff --git a/CMake/CMakeMacros_old/general/EndingsToCollect.cmake b/CMake/CMakeMacros_old/general/EndingsToCollect.cmake
deleted file mode 100644
index f4ca6725f..000000000
--- a/CMake/CMakeMacros_old/general/EndingsToCollect.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
-macro(addFileEndingToCollect file_ending)
- #input: file_ending --> appends it to the list of files to collect
-
- list (FIND FILES_TO_COLLECT ${file_ending} index)
- if (${index} EQUAL -1)
- set(FILES_TO_COLLECT ${FILES_TO_COLLECT} ${file_ending})
- endif()
-
- #output: files_to_collect
-endmacro(addFileEndingToCollect)
-
-
-
-macro(resetFileEndingsToCollect)
- unset(FILES_TO_COLLECT)
-endmacro(resetFileEndingsToCollect)
-
-
-
-
-macro(addCAndCPPFileTypes)
- addFileEndingToCollect("*.h")
- addFileEndingToCollect("*.c")
- addFileEndingToCollect("*.cpp")
- addFileEndingToCollect("*.cxx")
- addFileEndingToCollect("*.hpp")
- addFileEndingToCollect("*.cu")
- addFileEndingToCollect("*.cuh")
-endmacro(addCAndCPPFileTypes)
-
-
-macro(addObjCAndObjCPPFileTypesToCollect)
- addFileEndingToCollect("*.m")
- addFileEndingToCollect("*.mm")
- addFileEndingToCollect("*.h")
-endmacro(addObjCAndObjCPPFileTypesToCollect)
diff --git a/CMake/CMakeMacros_old/general/FileUtilities.cmake b/CMake/CMakeMacros_old/general/FileUtilities.cmake
deleted file mode 100644
index 4e9b35370..000000000
--- a/CMake/CMakeMacros_old/general/FileUtilities.cmake
+++ /dev/null
@@ -1,109 +0,0 @@
-macro(includeRecursiveAllFilesFrom targetName path)
- set(collectTestFiles ON)
- set(collectProductionFiles ON)
-
- includeRecursiveFilesFrom(${targetName} ${path})
-endmacro(includeRecursiveAllFilesFrom)
-
-
-
-macro(includeRecursiveProductionFilesFrom targetName path)
- set(collectTestFiles OFF)
- set(collectProductionFiles ON)
-
- includeRecursiveFilesFrom(${targetName} ${path})
-endmacro(includeRecursiveProductionFilesFrom)
-
-
-
-macro(includeRecursiveTestFilesFrom targetName path)
- set(collectTestFiles ON)
- set(collectProductionFiles OFF)
-
- includeRecursiveFilesFrom(${targetName} ${path})
-endmacro(includeRecursiveTestFilesFrom)
-
-
-
-
-macro(includeRecursiveFilesFrom targetName path)
- file(GLOB_RECURSE includeSourcePaths ${path}/package.include)
-
- foreach(package ${includeSourcePaths})
- get_filename_component(package_dir ${package} DIRECTORY)
- collectFilesFrom(${package_dir} "${FILES_TO_COLLECT}")
- setSourceGroupForFilesIn(${package_dir} ${targetName})
- endforeach()
-endmacro(includeRecursiveFilesFrom)
-
-
-
-macro(collectFilesFrom path file_endings)
- #input: path from files to collect
- unset(COLLECTED_FILES_IN_PATH)
- unset(ALL_FILES_IN_PATH)
-
- foreach(_ending ${file_endings})
- FILE(GLOB filesWithEnding ${path}/${_ending})
- set(ALL_FILES_IN_PATH ${ALL_FILES_IN_PATH} ${filesWithEnding})
- endforeach()
-
- foreach(_file ${ALL_FILES_IN_PATH})
- get_filename_component(fileName ${_file} NAME)
- if(collectTestFiles)
- if(${fileName} MATCHES "Test" OR ${fileName} MATCHES "Mock")
- set(COLLECTED_FILES_IN_PATH ${COLLECTED_FILES_IN_PATH} ${_file})
- endif()
- endif()
- if(collectProductionFiles)
- if(NOT ${fileName} MATCHES "Test" AND NOT ${fileName} MATCHES "Mock")
- set(COLLECTED_FILES_IN_PATH ${COLLECTED_FILES_IN_PATH} ${_file})
- endif()
- endif()
- endforeach()
- set(MY_SRCS ${MY_SRCS} ${COLLECTED_FILES_IN_PATH})
-
- #output: MY_SRCS
-endmacro(collectFilesFrom)
-
-
-
-
-macro(setSourceGroupForFilesIn package_dir targetName)
-#input: target_name PACKAGE_SRCS
- buildSourceGroup(${targetName} ${package_dir})
-
- if(isAllTestSuite)
- source_group(${targetName}\\${SOURCE_GROUP} FILES ${COLLECTED_FILES_IN_PATH})
- else()
- source_group(${SOURCE_GROUP} FILES ${COLLECTED_FILES_IN_PATH})
- endif()
-#output: -
-endmacro(setSourceGroupForFilesIn)
-
-
-
-
-macro(buildSourceGroup targetName path)
-#input: targetName (e.g. lib name, exe name)
-
- unset(SOURCE_GROUP)
- string(REPLACE "/" ";" folderListFromPath ${path})
- set(findTargetName 0)
-
- foreach(folder ${folderListFromPath})
- if(findTargetName)
- set(SOURCE_GROUP ${SOURCE_GROUP}\\${folder})
- endif()
-
- if(${folder} STREQUAL ${targetName})
- SET(findTargetName 1)
- endif()
- endforeach()
-
- if(NOT SOURCE_GROUP)
- set(SOURCE_GROUP "general")
- endif()
-
-#output: SOURCE_GROUP
-endmacro(buildSourceGroup)
\ No newline at end of file
diff --git a/CMake/CMakeMacros_old/general/FindCompiler.cmake b/CMake/CMakeMacros_old/general/FindCompiler.cmake
deleted file mode 100644
index a878b377a..000000000
--- a/CMake/CMakeMacros_old/general/FindCompiler.cmake
+++ /dev/null
@@ -1,92 +0,0 @@
-#############################################################
-### COMPILER DETECTION ###
-#############################################################
-# Check for intel compiler
-if( CMAKE_CXX_COMPILER MATCHES "icpc" OR CMAKE_CXX_COMPILER_ARG1 MATCHES "icpc" )
- option ( VF_CXX_COMPILER_IS_INTEL "Use Intel compiler" ON )
- # Intel(R) Compiler has its own library archiver,
- # if you build libraries and do not use xiar,
- # the Intel compiler will complain about invalid
- # archives at the link phase.
- # The Intel(R) archiver is "xiar" usually
- # located in the same folder as the compiler,
- FIND_PROGRAM(XIAR xiar)
- IF(XIAR)
- SET(CMAKE_AR "${XIAR}")
- ENDIF(XIAR)
- MARK_AS_ADVANCED(XIAR)
-
- # Intel(R) Compiler also comes with its own linker
- # which provides a number of additional benefits when
- # linking code compiled with the Intel(R) compiler.
- # Again, usually in the same place as icc itself,
- FIND_PROGRAM(XILD xild)
- IF(XILD)
- SET(CMAKE_LINKER "${XILD}")
- ENDIF(XILD)
- MARK_AS_ADVANCED(XILD)
-else()
- option ( VF_CXX_COMPILER_IS_INTEL "Use Intel compiler" OFF )
-endif()
-mark_as_advanced ( VF_CXX_COMPILER_IS_INTEL )
-
-# Check for Gnu compiler
-if ( CMAKE_COMPILER_IS_GNUCXX AND NOT VF_CXX_COMPILER_IS_INTEL )
- option ( VF_CXX_COMPILER_IS_GNU "Use gnu compiler" ON )
-else()
- option ( VF_CXX_COMPILER_IS_GNU "Use gnu compiler" OFF )
-endif()
-mark_as_advanced ( VF_CXX_COMPILER_IS_GNU )
-
-# Check for Visual Studio
-if(MSVC)
- option (VF_CXX_COMPILER_IS_MSVC "Use Visual Studio compiler" ON)
-else()
- option (VF_CXX_COMPILER_IS_MSVC "Use Visual Studio compiler" OFF)
-endif()
-mark_as_advanced(VF_CXX_COMPILER_IS_MSVC)
-
-# Check for IBM compiler
-if( CMAKE_CXX_COMPILER MATCHES "xlc" OR CMAKE_CXX_COMPILER_ARG1 MATCHES "xlc" )
- option ( VF_CXX_COMPILER_IS_IBM "Use IBM compiler" ON )
-else()
- option ( VF_CXX_COMPILER_IS_IBM "Use IBM compiler" OFF )
-endif()
-mark_as_advanced ( VF_CXX_COMPILER_IS_IBM )
-
-# Check for NEC SX compiler
-if( CMAKE_CXX_COMPILER MATCHES "sxc" OR CMAKE_CXX_COMPILER_ARG1 MATCHES "sxc" OR CMAKE_CXX_COMPILER MATCHES "sxmpic" OR CMAKE_CXX_COMPILER_ARG1 MATCHES "sxmpic" )
- option ( VF_CXX_COMPILER_IS_NEC "Use NEC compiler" ON )
-else()
- option ( VF_CXX_COMPILER_IS_NEC "Use NEC compiler" OFF )
-endif()
-mark_as_advanced ( VF_CXX_COMPILER_IS_NEC )
-
-# Check for Clang compiler
-if( CMAKE_CXX_COMPILER MATCHES "clang" OR CMAKE_CXX_COMPILER_ARG1 MATCHES "clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" )
- option ( VF_CXX_COMPILER_IS_CLANG "Use clang compiler" ON )
-else()
- option ( VF_CXX_COMPILER_IS_CLANG "Use clang compiler" OFF )
-endif()
-mark_as_advanced ( VF_CXX_COMPILER_IS_CLANG )
-
-if( CMAKE_CXX_COMPILER_ID MATCHES Cray )
- option ( VF_CXX_COMPILER_IS_CRAY "Use Cray compiler" ON )
- if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.4)
- message( FATAL_ERROR "Insufficient Cray Compiler Environment version" )
- endif()
-else()
- option ( VF_CXX_COMPILER_IS_CRAY "Use Cray compiler" OFF )
-endif()
-mark_as_advanced ( VF_CXX_COMPILER_IS_CRAY )
-
-# Check for MPI wrapper
-get_filename_component( CXX_COMPILER_WITHOUT_PATH ${CMAKE_CXX_COMPILER} NAME )
-if( CXX_COMPILER_WITHOUT_PATH MATCHES "mpi" OR CMAKE_CXX_COMPILER_ARG1 MATCHES "mpi" )
- option ( VF_CXX_COMPILER_IS_MPI_WRAPPER "Compiler is MPI wrapper" ON )
-else()
- option ( VF_CXX_COMPILER_IS_MPI_WRAPPER "Compiler is MPI wrapper" OFF )
-endif()
-mark_as_advanced ( VF_CXX_COMPILER_IS_MPI_WRAPPER )
-
-############################################################################################################################
diff --git a/CMake/VirtualFluidsMacros.cmake b/CMake/VirtualFluidsMacros.cmake
index dd9553e47..676353ea2 100644
--- a/CMake/VirtualFluidsMacros.cmake
+++ b/CMake/VirtualFluidsMacros.cmake
@@ -43,6 +43,8 @@ IF(APPLE)
list(APPEND VF_COMPILER_DEFINITION __APPLE__)
endif()
+list(APPEND VF_COMPILER_DEFINITION ${CMAKE_CXX_COMPILER_ID})
+
#################################################################
### load compiler and machine file ###
#################################################################
diff --git a/CMake/compilerflags/MSVC.cmake b/CMake/compilerflags/MSVC.cmake
index 4762101a9..0a279571c 100644
--- a/CMake/compilerflags/MSVC.cmake
+++ b/CMake/compilerflags/MSVC.cmake
@@ -18,7 +18,10 @@ ENDIF()
###############################################################################################################
## Flags
###############################################################################################################
-LIST(APPEND VF_COMPILER_DEFINITION _CRT_SECURE_NO_DEPRECATE)
-LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4996") #deprecated strcpy...
-LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4800") #forcing value to bool 'true' or 'false' (performance warning)
-LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/bigobj") #ansonsten funzt mit boost das compilieren unter windows nimmer
+LIST(APPEND VF_COMPILER_DEFINITION _CRT_SECURE_NO_DEPRECATE) # disable warnings promoting Microsoft's security enhanced CRT
+LIST(APPEND VF_COMPILER_DEFINITION _SCL_SECURE_NO_WARNINGS) # disable warnings triggered by Microsoft's checked iterators
+LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4996") # deprecated strcpy...
+LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4800") # forcing value to bool 'true' or 'false' (performance warning)
+LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/bigobj") # ansonsten funzt mit boost das compilieren unter windows nimmer
+
+LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-MP") # enable multi-threaded compiling
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47c6ff0a1..01f46ac17 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,9 +53,6 @@ endif()
include(CMakePrintHelpers)
include(${VF_CMAKE_DIR}/VirtualFluidsMacros.cmake)
-include(${VF_CMAKE_DIR}/CMakeMacros_old/general/FindCompiler.cmake)
-configure_file(src/basics/VirtualFluidsDefinitions.in.h ${CMAKE_BINARY_DIR}/VirtualFluidsDefinitions.h)
-
#################################################################################
# COMMON LIBRARIES
#################################################################################
diff --git a/gpu.cmake b/gpu.cmake
index e9f33a5ea..b1c5bf6df 100644
--- a/gpu.cmake
+++ b/gpu.cmake
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
if(UNIX)
set(CMAKE_CXX_STANDARD 14)
@@ -18,13 +17,6 @@ endif()
project(VirtualFluidsGPU)
-IF(MSVC)
- ADD_DEFINITIONS ( "-DNOMINMAX" ) # Disable Min/Max-Macros
- ADD_DEFINITIONS ( "-D_CRT_SECURE_NO_WARNINGS" ) # disable warnings promoting Microsoft's security enhanced CRT
- ADD_DEFINITIONS ( "-D_SCL_SECURE_NO_WARNINGS" ) # disable warnings triggered by Microsoft's checked iterators
- SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -MP" ) # enable multi-threaded compiling
- SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj" ) # enable big object files (fatal error C1128)
-ENDIF(MSVC)
#############################################################
### OPTIONS ###
@@ -38,7 +30,7 @@ option(VF.BUILD_NUMERIC_TESTS "Build numeric tests" OFF)
option(VF.BUILD_DOUBLE_ACCURACY "Use double accuracy" OFF )
IF( VF.BUILD_DOUBLE_ACCURACY )
- SET( VF_DOUBLE_ACCURACY 1 )
+ list(APPEND VF_COMPILER_DEFINITION VF_DOUBLE_ACCURACY)
ENDIF()
#############################################################
diff --git a/src/basics/Core/DataTypes.h b/src/basics/Core/DataTypes.h
index b65f3344c..5a86b7841 100644
--- a/src/basics/Core/DataTypes.h
+++ b/src/basics/Core/DataTypes.h
@@ -3,7 +3,7 @@
#include <string>
-#include "VirtualFluidsDefinitions.h"
+
#ifdef VF_DOUBLE_ACCURACY
typedef double real;
diff --git a/src/basics/Core/RealConstants.h b/src/basics/Core/RealConstants.h
index a555d7ee2..b63ff444f 100644
--- a/src/basics/Core/RealConstants.h
+++ b/src/basics/Core/RealConstants.h
@@ -1,7 +1,7 @@
#ifndef REAL_CONSTANT_H
#define REAL_CONSTANT_H
-#include "VirtualFluidsDefinitions.h"
+
#ifdef VF_DOUBLE_ACCURACY
#define c1o2 0.5
diff --git a/src/basics/Core/Timer/Timer.h b/src/basics/Core/Timer/Timer.h
index 53c79e761..25021f68a 100644
--- a/src/basics/Core/Timer/Timer.h
+++ b/src/basics/Core/Timer/Timer.h
@@ -1,7 +1,7 @@
#ifndef TIMER_H
#define TIMER_H
-//#include "VirtualFluidsDefinitions.h"
+//
#include "basics_export.h"
#include "DataTypes.h"
diff --git a/src/basics/Core/Timer/TimerImp.h b/src/basics/Core/Timer/TimerImp.h
index d45691079..6021cc037 100644
--- a/src/basics/Core/Timer/TimerImp.h
+++ b/src/basics/Core/Timer/TimerImp.h
@@ -5,7 +5,7 @@
#include <chrono>
-//#include "VirtualFluidsDefinitions.h"
+//
#include "DataTypes.h"
diff --git a/src/basics/VirtualFluidsDefinitions.in.h b/src/basics/VirtualFluidsDefinitions.in.h
deleted file mode 100644
index 587a0a215..000000000
--- a/src/basics/VirtualFluidsDefinitions.in.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef VIRTUAL_FLUIDS_DEFINITIONS_H
-#define VIRTUAL_FLUIDS_DEFINITIONS_H
-
-#cmakedefine BUILD_SHARED_LIBS
-
-// disable warnings
-#pragma warning(disable: 4251)// occurs normally while exporting standard library: "needs to have dll-interface to be"
-#pragma warning(disable: 4275) // on dll-interface class <classname> used as base for dll-interface class <classname>
-
-
-// double or single precision
-#cmakedefine VF_DOUBLE_ACCURACY
-
-// External libraries
-#cmakedefine VF_BUILD_WITH_MPI
-#cmakedefine VF_BUILD_WITH_METIS
-#cmakedefine VF_BUILD_WITH_CUDA
-
-// Compiler
-#cmakedefine VF_CXX_COMPILER_IS_GNU
-#cmakedefine VF_CXX_COMPILER_IS_INTEL
-#cmakedefine VF_CXX_COMPILER_IS_IBM
-#cmakedefine VF_CXX_COMPILER_IS_MSVC
-#cmakedefine VF_CXX_COMPILER_IS_CLANG
-
-#endif
diff --git a/src/gpu/GksGpu/Analyzer/ConvergenceAnalyzer.h b/src/gpu/GksGpu/Analyzer/ConvergenceAnalyzer.h
index b6697557a..52b1896a2 100644
--- a/src/gpu/GksGpu/Analyzer/ConvergenceAnalyzer.h
+++ b/src/gpu/GksGpu/Analyzer/ConvergenceAnalyzer.h
@@ -3,7 +3,7 @@
#include <vector>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/Analyzer/CupsAnalyzer.cpp b/src/gpu/GksGpu/Analyzer/CupsAnalyzer.cpp
index d1a1e5e7c..1d23a82be 100644
--- a/src/gpu/GksGpu/Analyzer/CupsAnalyzer.cpp
+++ b/src/gpu/GksGpu/Analyzer/CupsAnalyzer.cpp
@@ -6,7 +6,7 @@
#include "Core/Logger/Logger.h"
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "DataBase/DataBase.h"
diff --git a/src/gpu/GksGpu/Analyzer/CupsAnalyzer.h b/src/gpu/GksGpu/Analyzer/CupsAnalyzer.h
index b4c2e087e..095e79550 100644
--- a/src/gpu/GksGpu/Analyzer/CupsAnalyzer.h
+++ b/src/gpu/GksGpu/Analyzer/CupsAnalyzer.h
@@ -3,7 +3,7 @@
#include <string>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/Analyzer/EnstrophyAnalyzer.h b/src/gpu/GksGpu/Analyzer/EnstrophyAnalyzer.h
index 409f742c6..43acf5b51 100644
--- a/src/gpu/GksGpu/Analyzer/EnstrophyAnalyzer.h
+++ b/src/gpu/GksGpu/Analyzer/EnstrophyAnalyzer.h
@@ -4,7 +4,7 @@
#include <vector>
#include <string>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/Analyzer/HeatFluxAnalyzer.h b/src/gpu/GksGpu/Analyzer/HeatFluxAnalyzer.h
index 0bca4db1a..e64c24310 100644
--- a/src/gpu/GksGpu/Analyzer/HeatFluxAnalyzer.h
+++ b/src/gpu/GksGpu/Analyzer/HeatFluxAnalyzer.h
@@ -4,7 +4,7 @@
#include <vector>
#include <string>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/Analyzer/KineticEnergyAnalyzer.h b/src/gpu/GksGpu/Analyzer/KineticEnergyAnalyzer.h
index 213c06178..ee69b4098 100644
--- a/src/gpu/GksGpu/Analyzer/KineticEnergyAnalyzer.h
+++ b/src/gpu/GksGpu/Analyzer/KineticEnergyAnalyzer.h
@@ -4,7 +4,7 @@
#include <vector>
#include <string>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/Analyzer/PointTimeSeriesAnalyzer.h b/src/gpu/GksGpu/Analyzer/PointTimeSeriesAnalyzer.h
index 3c5397903..658c7a9d0 100644
--- a/src/gpu/GksGpu/Analyzer/PointTimeSeriesAnalyzer.h
+++ b/src/gpu/GksGpu/Analyzer/PointTimeSeriesAnalyzer.h
@@ -5,7 +5,7 @@
#include <string>
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/Analyzer/PointTimeSeriesCollector.h b/src/gpu/GksGpu/Analyzer/PointTimeSeriesCollector.h
index 3d7b57c9f..6725e7658 100644
--- a/src/gpu/GksGpu/Analyzer/PointTimeSeriesCollector.h
+++ b/src/gpu/GksGpu/Analyzer/PointTimeSeriesCollector.h
@@ -6,7 +6,7 @@
#include <string>
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/Analyzer/TurbulenceAnalyzer.h b/src/gpu/GksGpu/Analyzer/TurbulenceAnalyzer.h
index 57e1bc89a..1f9f3d733 100644
--- a/src/gpu/GksGpu/Analyzer/TurbulenceAnalyzer.h
+++ b/src/gpu/GksGpu/Analyzer/TurbulenceAnalyzer.h
@@ -5,7 +5,7 @@
#include <string>
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/AdiabaticWall.h b/src/gpu/GksGpu/BoundaryConditions/AdiabaticWall.h
index c35e08c7d..88519dc3d 100644
--- a/src/gpu/GksGpu/BoundaryConditions/AdiabaticWall.h
+++ b/src/gpu/GksGpu/BoundaryConditions/AdiabaticWall.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/BoundaryCondition.h b/src/gpu/GksGpu/BoundaryConditions/BoundaryCondition.h
index 3d79879f0..fe4078af9 100644
--- a/src/gpu/GksGpu/BoundaryConditions/BoundaryCondition.h
+++ b/src/gpu/GksGpu/BoundaryConditions/BoundaryCondition.h
@@ -6,7 +6,7 @@
#include <memory>
#include <vector>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/ConcreteHeatFlux.h b/src/gpu/GksGpu/BoundaryConditions/ConcreteHeatFlux.h
index 14c1f2519..b8ff0d316 100644
--- a/src/gpu/GksGpu/BoundaryConditions/ConcreteHeatFlux.h
+++ b/src/gpu/GksGpu/BoundaryConditions/ConcreteHeatFlux.h
@@ -5,7 +5,7 @@
#include <thrust/device_vector.h>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/CreepingMassFlux.h b/src/gpu/GksGpu/BoundaryConditions/CreepingMassFlux.h
index 7441f17a2..70d5f11f2 100644
--- a/src/gpu/GksGpu/BoundaryConditions/CreepingMassFlux.h
+++ b/src/gpu/GksGpu/BoundaryConditions/CreepingMassFlux.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/Extrapolation.h b/src/gpu/GksGpu/BoundaryConditions/Extrapolation.h
index 5b7f63ef6..4353a5e58 100644
--- a/src/gpu/GksGpu/BoundaryConditions/Extrapolation.h
+++ b/src/gpu/GksGpu/BoundaryConditions/Extrapolation.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/HeatFlux.h b/src/gpu/GksGpu/BoundaryConditions/HeatFlux.h
index f5e10aa35..701f9f4db 100644
--- a/src/gpu/GksGpu/BoundaryConditions/HeatFlux.h
+++ b/src/gpu/GksGpu/BoundaryConditions/HeatFlux.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/Inflow.h b/src/gpu/GksGpu/BoundaryConditions/Inflow.h
index e6b23a58a..b1036c418 100644
--- a/src/gpu/GksGpu/BoundaryConditions/Inflow.h
+++ b/src/gpu/GksGpu/BoundaryConditions/Inflow.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/InflowComplete.h b/src/gpu/GksGpu/BoundaryConditions/InflowComplete.h
index 778856d22..6d402d150 100644
--- a/src/gpu/GksGpu/BoundaryConditions/InflowComplete.h
+++ b/src/gpu/GksGpu/BoundaryConditions/InflowComplete.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/IsothermalWall.h b/src/gpu/GksGpu/BoundaryConditions/IsothermalWall.h
index 7717ebd50..57bafca6b 100644
--- a/src/gpu/GksGpu/BoundaryConditions/IsothermalWall.h
+++ b/src/gpu/GksGpu/BoundaryConditions/IsothermalWall.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/MassCompensation.h b/src/gpu/GksGpu/BoundaryConditions/MassCompensation.h
index 48349c58d..6b2c47206 100644
--- a/src/gpu/GksGpu/BoundaryConditions/MassCompensation.h
+++ b/src/gpu/GksGpu/BoundaryConditions/MassCompensation.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/Open.h b/src/gpu/GksGpu/BoundaryConditions/Open.h
index d3f489ed8..16cf9736b 100644
--- a/src/gpu/GksGpu/BoundaryConditions/Open.h
+++ b/src/gpu/GksGpu/BoundaryConditions/Open.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/PassiveScalarDiriclet.h b/src/gpu/GksGpu/BoundaryConditions/PassiveScalarDiriclet.h
index a5a64d9ec..0c46b12a0 100644
--- a/src/gpu/GksGpu/BoundaryConditions/PassiveScalarDiriclet.h
+++ b/src/gpu/GksGpu/BoundaryConditions/PassiveScalarDiriclet.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/Periodic.h b/src/gpu/GksGpu/BoundaryConditions/Periodic.h
index e8ab6e145..3d6755f9d 100644
--- a/src/gpu/GksGpu/BoundaryConditions/Periodic.h
+++ b/src/gpu/GksGpu/BoundaryConditions/Periodic.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/Pressure.h b/src/gpu/GksGpu/BoundaryConditions/Pressure.h
index 459b8d26a..4413a2d0c 100644
--- a/src/gpu/GksGpu/BoundaryConditions/Pressure.h
+++ b/src/gpu/GksGpu/BoundaryConditions/Pressure.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/Pressure2.h b/src/gpu/GksGpu/BoundaryConditions/Pressure2.h
index d61c84ae9..18dc531a5 100644
--- a/src/gpu/GksGpu/BoundaryConditions/Pressure2.h
+++ b/src/gpu/GksGpu/BoundaryConditions/Pressure2.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/SalinasVazquez.h b/src/gpu/GksGpu/BoundaryConditions/SalinasVazquez.h
index 4d3dbd7b6..5769b157e 100644
--- a/src/gpu/GksGpu/BoundaryConditions/SalinasVazquez.h
+++ b/src/gpu/GksGpu/BoundaryConditions/SalinasVazquez.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/Symmetry.h b/src/gpu/GksGpu/BoundaryConditions/Symmetry.h
index 3132628b7..6fd73fa38 100644
--- a/src/gpu/GksGpu/BoundaryConditions/Symmetry.h
+++ b/src/gpu/GksGpu/BoundaryConditions/Symmetry.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/CellUpdate/CellUpdate.h b/src/gpu/GksGpu/CellUpdate/CellUpdate.h
index de4d5494a..de8a0b86c 100644
--- a/src/gpu/GksGpu/CellUpdate/CellUpdate.h
+++ b/src/gpu/GksGpu/CellUpdate/CellUpdate.h
@@ -1,7 +1,7 @@
#ifndef CellUpdate_H
#define CellUpdate_H
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/Communication/Communicator.h b/src/gpu/GksGpu/Communication/Communicator.h
index 87a72a37f..4b8835637 100644
--- a/src/gpu/GksGpu/Communication/Communicator.h
+++ b/src/gpu/GksGpu/Communication/Communicator.h
@@ -6,7 +6,7 @@
#include <mpi.h>
//#include <mutex>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/Communication/MpiUtility.h b/src/gpu/GksGpu/Communication/MpiUtility.h
index 96484a2aa..f2aa1a8be 100644
--- a/src/gpu/GksGpu/Communication/MpiUtility.h
+++ b/src/gpu/GksGpu/Communication/MpiUtility.h
@@ -3,7 +3,7 @@
#include <mpi.h>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/CudaUtility/CudaUtility.h b/src/gpu/GksGpu/CudaUtility/CudaUtility.h
index b9008cd73..fa312e9d4 100644
--- a/src/gpu/GksGpu/CudaUtility/CudaUtility.h
+++ b/src/gpu/GksGpu/CudaUtility/CudaUtility.h
@@ -4,7 +4,7 @@
#include <cuda.h>
#include <cuda_runtime.h>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "Core/DataTypes.h"
diff --git a/src/gpu/GksGpu/DataBase/DataBase.h b/src/gpu/GksGpu/DataBase/DataBase.h
index ca485d47b..02475ae98 100644
--- a/src/gpu/GksGpu/DataBase/DataBase.h
+++ b/src/gpu/GksGpu/DataBase/DataBase.h
@@ -11,7 +11,7 @@
#include "Core/VectorTypes.h"
#include "Core/ArrayTypes.h"
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "Definitions/AccumulatorDataType.h"
diff --git a/src/gpu/GksGpu/DataBase/DataBaseAllocator.h b/src/gpu/GksGpu/DataBase/DataBaseAllocator.h
index 04daba9dc..e50c58f13 100644
--- a/src/gpu/GksGpu/DataBase/DataBaseAllocator.h
+++ b/src/gpu/GksGpu/DataBase/DataBaseAllocator.h
@@ -7,7 +7,7 @@
#include "Core/DataTypes.h"
#include "PointerDefinitions.h"
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
class GksMeshAdapter;
diff --git a/src/gpu/GksGpu/DataBase/DataBaseAllocatorCPU.h b/src/gpu/GksGpu/DataBase/DataBaseAllocatorCPU.h
index 16b2c8096..420223338 100644
--- a/src/gpu/GksGpu/DataBase/DataBaseAllocatorCPU.h
+++ b/src/gpu/GksGpu/DataBase/DataBaseAllocatorCPU.h
@@ -6,7 +6,7 @@
#include "DataBaseAllocator.h"
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
namespace GksGpu {
diff --git a/src/gpu/GksGpu/DataBase/DataBaseAllocatorGPU.h b/src/gpu/GksGpu/DataBase/DataBaseAllocatorGPU.h
index 8c05836db..4ed547e22 100644
--- a/src/gpu/GksGpu/DataBase/DataBaseAllocatorGPU.h
+++ b/src/gpu/GksGpu/DataBase/DataBaseAllocatorGPU.h
@@ -6,7 +6,7 @@
#include "DataBaseAllocator.h"
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
namespace GksGpu {
diff --git a/src/gpu/GksGpu/FluxComputation/ApplyFlux.cuh b/src/gpu/GksGpu/FluxComputation/ApplyFlux.cuh
index ed9abe98f..0a938799d 100644
--- a/src/gpu/GksGpu/FluxComputation/ApplyFlux.cuh
+++ b/src/gpu/GksGpu/FluxComputation/ApplyFlux.cuh
@@ -1,7 +1,7 @@
#ifndef ApplyFlux_CUH
#define ApplyFlux_CUH
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "Core/DataTypes.h"
diff --git a/src/gpu/GksGpu/FluxComputation/AssembleFlux.cuh b/src/gpu/GksGpu/FluxComputation/AssembleFlux.cuh
index 59522e2a1..3e00c3ae3 100644
--- a/src/gpu/GksGpu/FluxComputation/AssembleFlux.cuh
+++ b/src/gpu/GksGpu/FluxComputation/AssembleFlux.cuh
@@ -1,7 +1,7 @@
#ifndef AssembleFlux_CUH
#define AssembleFlux_CUH
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "Core/DataTypes.h"
diff --git a/src/gpu/GksGpu/FluxComputation/ExpansionCoefficients.cuh b/src/gpu/GksGpu/FluxComputation/ExpansionCoefficients.cuh
index 21aa4dc52..69c00acdd 100644
--- a/src/gpu/GksGpu/FluxComputation/ExpansionCoefficients.cuh
+++ b/src/gpu/GksGpu/FluxComputation/ExpansionCoefficients.cuh
@@ -1,7 +1,7 @@
#ifndef ExpansionCoefficients_CUH
#define ExpansionCoefficients_CUH
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "Core/DataTypes.h"
diff --git a/src/gpu/GksGpu/FluxComputation/FluxComputation.h b/src/gpu/GksGpu/FluxComputation/FluxComputation.h
index 7913828ef..0fe86577d 100644
--- a/src/gpu/GksGpu/FluxComputation/FluxComputation.h
+++ b/src/gpu/GksGpu/FluxComputation/FluxComputation.h
@@ -1,7 +1,7 @@
#ifndef FluxComputation_H
#define FluxComputation_H
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/FluxComputation/Moments.cuh b/src/gpu/GksGpu/FluxComputation/Moments.cuh
index c43d28e4e..8ba25dbef 100644
--- a/src/gpu/GksGpu/FluxComputation/Moments.cuh
+++ b/src/gpu/GksGpu/FluxComputation/Moments.cuh
@@ -1,7 +1,7 @@
#ifndef Moments_CUH
#define Moments_CUH
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "Core/DataTypes.h"
diff --git a/src/gpu/GksGpu/FluxComputation/Reconstruction.cuh b/src/gpu/GksGpu/FluxComputation/Reconstruction.cuh
index 565fd80dc..74134aba8 100644
--- a/src/gpu/GksGpu/FluxComputation/Reconstruction.cuh
+++ b/src/gpu/GksGpu/FluxComputation/Reconstruction.cuh
@@ -1,7 +1,7 @@
#ifndef Reconstruction_CUH
#define Reconstruction_CUH
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "Core/DataTypes.h"
diff --git a/src/gpu/GksGpu/FluxComputation/Smagorinsky.cuh b/src/gpu/GksGpu/FluxComputation/Smagorinsky.cuh
index 62e52bebe..8a03ae722 100644
--- a/src/gpu/GksGpu/FluxComputation/Smagorinsky.cuh
+++ b/src/gpu/GksGpu/FluxComputation/Smagorinsky.cuh
@@ -3,7 +3,7 @@
#include <cmath>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "Core/DataTypes.h"
diff --git a/src/gpu/GksGpu/FluxComputation/SutherlandsLaw.cuh b/src/gpu/GksGpu/FluxComputation/SutherlandsLaw.cuh
index 99ade55c4..5af3ca388 100644
--- a/src/gpu/GksGpu/FluxComputation/SutherlandsLaw.cuh
+++ b/src/gpu/GksGpu/FluxComputation/SutherlandsLaw.cuh
@@ -3,7 +3,7 @@
#include <cmath>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "Core/DataTypes.h"
diff --git a/src/gpu/GksGpu/FluxComputation/Transformation.cuh b/src/gpu/GksGpu/FluxComputation/Transformation.cuh
index bb41a5db3..d8ffb91fa 100644
--- a/src/gpu/GksGpu/FluxComputation/Transformation.cuh
+++ b/src/gpu/GksGpu/FluxComputation/Transformation.cuh
@@ -1,7 +1,7 @@
#ifndef Transformation_CUH
#define Transformation_CUH
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "Core/DataTypes.h"
diff --git a/src/gpu/GksGpu/Initializer/Initializer.h b/src/gpu/GksGpu/Initializer/Initializer.h
index 1d04b25ba..badac795f 100644
--- a/src/gpu/GksGpu/Initializer/Initializer.h
+++ b/src/gpu/GksGpu/Initializer/Initializer.h
@@ -5,7 +5,7 @@
#include <memory>
#include <functional>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/Interface/Interface.h b/src/gpu/GksGpu/Interface/Interface.h
index a5c66b60d..5aa99bd99 100644
--- a/src/gpu/GksGpu/Interface/Interface.h
+++ b/src/gpu/GksGpu/Interface/Interface.h
@@ -1,7 +1,7 @@
#ifndef FineToCoarse_H
#define FineToCoarse_H
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/TimeStepping/NestedTimeStep.h b/src/gpu/GksGpu/TimeStepping/NestedTimeStep.h
index a5704b4cc..315db1778 100644
--- a/src/gpu/GksGpu/TimeStepping/NestedTimeStep.h
+++ b/src/gpu/GksGpu/TimeStepping/NestedTimeStep.h
@@ -1,7 +1,7 @@
#ifndef NestedTimeStep_H
#define NestedTimeStep_H
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksMeshAdapter/GksMeshAdapter.h b/src/gpu/GksMeshAdapter/GksMeshAdapter.h
index b314f1dbe..ede88301f 100644
--- a/src/gpu/GksMeshAdapter/GksMeshAdapter.h
+++ b/src/gpu/GksMeshAdapter/GksMeshAdapter.h
@@ -11,7 +11,7 @@
#include "MeshCell.h"
#include "MeshFace.h"
-#include "VirtualFluidsDefinitions.h"
+
#include "GksMeshAdapter_export.h"
diff --git a/src/gpu/GksVtkAdapter/VTKAdapter.h b/src/gpu/GksVtkAdapter/VTKAdapter.h
index ccefbd0b8..5f3209a04 100644
--- a/src/gpu/GksVtkAdapter/VTKAdapter.h
+++ b/src/gpu/GksVtkAdapter/VTKAdapter.h
@@ -22,7 +22,7 @@
#include "PointerDefinitions.h"
-#include "VirtualFluidsDefinitions.h"
+
#include "DataBase/DataBase.h"
#include "Parameters/Parameters.h"
diff --git a/src/gpu/GksVtkAdapter/VTKInterface.h b/src/gpu/GksVtkAdapter/VTKInterface.h
index 17f878b8c..0120a7ad1 100644
--- a/src/gpu/GksVtkAdapter/VTKInterface.h
+++ b/src/gpu/GksVtkAdapter/VTKInterface.h
@@ -3,7 +3,7 @@
#include "GksGpu/Parameters/Parameters.h"
-#include "VirtualFluidsDefinitions.h"
+
#include "GksVtkAdapter_export.h"
namespace GksGpu{
diff --git a/src/gpu/GridGenerator/global.h b/src/gpu/GridGenerator/global.h
index 517d905ff..3378265ea 100644
--- a/src/gpu/GridGenerator/global.h
+++ b/src/gpu/GridGenerator/global.h
@@ -7,7 +7,7 @@
#define DIMENSION 3
#define MASTERRANK 0
-#include "VirtualFluidsDefinitions.h"
+
#include "GridGenerator_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GridGenerator/utilities/math/Math.cu b/src/gpu/GridGenerator/utilities/math/Math.cu
index 308bae6b1..ef05bf52b 100644
--- a/src/gpu/GridGenerator/utilities/math/Math.cu
+++ b/src/gpu/GridGenerator/utilities/math/Math.cu
@@ -2,7 +2,7 @@
#include <cmath>
-#include "VirtualFluidsDefinitions.h"
+
HOSTDEVICE bool vf::Math::equal(const real& val1, const real& val2, real maxRelDiff)
{
diff --git a/src/gpu/VirtualFluids_GPU/GPU/EnstrophyAnalyzer.h b/src/gpu/VirtualFluids_GPU/GPU/EnstrophyAnalyzer.h
index 05b5d7906..27915f1ac 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/EnstrophyAnalyzer.h
+++ b/src/gpu/VirtualFluids_GPU/GPU/EnstrophyAnalyzer.h
@@ -4,7 +4,7 @@
#include <vector>
#include <string>
-#include "VirtualFluidsDefinitions.h"
+
#include "PointerDefinitions.h"
#include "Core/DataTypes.h"
diff --git a/src/gpu/VirtualFluids_GPU/GPU/KineticEnergyAnalyzer.h b/src/gpu/VirtualFluids_GPU/GPU/KineticEnergyAnalyzer.h
index 1269167f5..ca5a97aae 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/KineticEnergyAnalyzer.h
+++ b/src/gpu/VirtualFluids_GPU/GPU/KineticEnergyAnalyzer.h
@@ -4,7 +4,7 @@
#include <vector>
#include <string>
-#include "VirtualFluidsDefinitions.h"
+
#include "PointerDefinitions.h"
#include "Core/DataTypes.h"
diff --git a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h
index 1a6aaa776..c053add83 100644
--- a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h
+++ b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h
@@ -23,7 +23,7 @@
#include <curand.h>
#include <curand_kernel.h>
#include "PointerDefinitions.h"
-#include "VirtualFluidsDefinitions.h"
+
#include "VirtualFluids_GPU_export.h"
#include "Kernel/Utilities/KernelType.h"
--
GitLab