From f51e62281f87b53a130384def7ece93c01b6dd09 Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Thu, 25 Jun 2020 14:27:59 +0200
Subject: [PATCH] Part 5. Move original VF gpu into gpu/
---
.../apps/LBM/streetTest/CMakePackage.cmake | 9 -----
targets/libs/Core/3rdPartyLinking.cmake | 6 ----
targets/libs/Core/CMakeLists.txt | 18 ----------
targets/libs/Core/CMakePackage.cmake | 8 -----
targets/libs/Core/buildInfo.cmake | 17 ---------
.../libs/Core/buildInfoInput/buildInfo.in.cpp | 12 -------
targets/libs/GksGpu/3rdPartyLinking.cmake | 6 ----
targets/libs/GksGpu/CMakeLists.txt | 18 ----------
.../libs/GksMeshAdapter/3rdPartyLinking.cmake | 6 ----
targets/libs/GksMeshAdapter/CMakeLists.txt | 18 ----------
targets/libs/GksVtkAdapter/CMakePackage.cmake | 8 -----
.../libs/GridGenerator/3rdPartyLinking.cmake | 10 ------
targets/libs/GridGenerator/CMakeLists.txt | 20 -----------
targets/libs/GridGenerator/CMakePackage.cmake | 8 -----
targets/libs/Traffic/CMakePackage.cmake | 8 -----
.../VirtualFluidsBasics/3rdPartyLinking.cmake | 6 ----
.../libs/VirtualFluidsBasics/CMakeLists.txt | 16 ---------
.../VirtualFluidsBasics/CMakePackage.cmake | 8 -----
.../VirtualFluids_GPU/3rdPartyLinking.cmake | 6 ----
targets/libs/VirtualFluids_GPU/CMakeLists.txt | 35 -------------------
.../libs/VirtualFluids_GPU/CMakePackage.cmake | 8 -----
.../NyTest/LogFileInformation/package.include | 0
.../PostProcessingStrategy/package.include | 0
.../Tests/NyTest/package.include | 0
.../LogFileInformation/package.include | 0
.../PostProcessingStrategy/package.include | 0
.../Tests/PhiTest/package.include | 0
.../Calculator/FFTCalculator/package.include | 0
.../package.include | 0
.../package.include | 0
.../L2NormCalculatorFactory/package.include | 0
.../L2NormCalculator/package.include | 0
.../Utilities/Calculator/package.include | 0
.../ColorConsoleOutput/package.include | 0
.../ConfigFileReaderNT/package.include | 0
.../package.include | 0
.../Y2dSliceToResults/package.include | 0
.../Utilities/DataWriter/package.include | 0
.../InitialCondition/package.include | 0
.../KernelConfiguration/package.include | 0
.../BasicSimulationInfo/package.include | 0
.../package.include | 0
.../LogFileHead/package.include | 0
.../LogFileTimeInformation/package.include | 0
.../package.include | 0
.../TestLogFileInformation/package.include | 0
.../LogFileInformation/package.include | 0
.../Utilities/LogFileQueue/package.include | 0
.../Utilities/LogFileWriter/package.include | 0
.../NumericalTestFactory/package.include | 0
.../NumericalTestGridReader/package.include | 0
.../NumericalTestSimulation/package.include | 0
.../NumericalTestSuite/package.include | 0
.../PostProcessingStrategy/package.include | 0
.../Results/AnalyticalResults/package.include | 0
.../Results/SimulationResults/package.include | 0
.../Utilities/Results/package.include | 0
.../Utilities/SimulationInfo/package.include | 0
.../SimulationParameter/package.include | 0
.../Utilities/Structs/package.include | 0
.../Utilities/Test/package.include | 0
.../Utilities/TestQueue/package.include | 0
.../Utilities/TestSimulation/package.include | 0
.../Utilities/Time/package.include | 0
.../VirtualFluidSimulation/package.include | 0
.../package.include | 0
targets/tests/NumericalTests/package.include | 0
67 files changed, 251 deletions(-)
delete mode 100644 targets/apps/LBM/streetTest/CMakePackage.cmake
delete mode 100644 targets/libs/Core/3rdPartyLinking.cmake
delete mode 100644 targets/libs/Core/CMakeLists.txt
delete mode 100644 targets/libs/Core/CMakePackage.cmake
delete mode 100644 targets/libs/Core/buildInfo.cmake
delete mode 100644 targets/libs/Core/buildInfoInput/buildInfo.in.cpp
delete mode 100644 targets/libs/GksGpu/3rdPartyLinking.cmake
delete mode 100644 targets/libs/GksGpu/CMakeLists.txt
delete mode 100644 targets/libs/GksMeshAdapter/3rdPartyLinking.cmake
delete mode 100644 targets/libs/GksMeshAdapter/CMakeLists.txt
delete mode 100644 targets/libs/GksVtkAdapter/CMakePackage.cmake
delete mode 100644 targets/libs/GridGenerator/3rdPartyLinking.cmake
delete mode 100644 targets/libs/GridGenerator/CMakeLists.txt
delete mode 100644 targets/libs/GridGenerator/CMakePackage.cmake
delete mode 100644 targets/libs/Traffic/CMakePackage.cmake
delete mode 100644 targets/libs/VirtualFluidsBasics/3rdPartyLinking.cmake
delete mode 100644 targets/libs/VirtualFluidsBasics/CMakeLists.txt
delete mode 100644 targets/libs/VirtualFluidsBasics/CMakePackage.cmake
delete mode 100644 targets/libs/VirtualFluids_GPU/3rdPartyLinking.cmake
delete mode 100644 targets/libs/VirtualFluids_GPU/CMakeLists.txt
delete mode 100644 targets/libs/VirtualFluids_GPU/CMakePackage.cmake
delete mode 100644 targets/tests/NumericalTests/Tests/NyTest/LogFileInformation/package.include
delete mode 100644 targets/tests/NumericalTests/Tests/NyTest/PostProcessingStrategy/package.include
delete mode 100644 targets/tests/NumericalTests/Tests/NyTest/package.include
delete mode 100644 targets/tests/NumericalTests/Tests/PhiTest/LogFileInformation/package.include
delete mode 100644 targets/tests/NumericalTests/Tests/PhiTest/PostProcessingStrategy/package.include
delete mode 100644 targets/tests/NumericalTests/Tests/PhiTest/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithAmplitude/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithBasicData/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/Calculator/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/ColorConsoleOutput/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/ConfigFileReaderNT/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/DataWriter/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/InitialCondition/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/KernelConfiguration/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileHead/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileTimeInformation/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/LogFileInformation/SimulationLogFileInformation/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/LogFileInformation/TestLogFileInformation/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/LogFileInformation/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/LogFileQueue/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/LogFileWriter/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/NumericalTestFactory/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/NumericalTestGridReader/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/NumericalTestSimulation/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/NumericalTestSuite/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/PostProcessingStrategy/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/Results/AnalyticalResults/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/Results/SimulationResults/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/Results/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/SimulationInfo/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/SimulationParameter/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/Structs/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/Test/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/TestQueue/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/TestSimulation/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/Time/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/VirtualFluidSimulation/package.include
delete mode 100644 targets/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/package.include
delete mode 100644 targets/tests/NumericalTests/package.include
diff --git a/targets/apps/LBM/streetTest/CMakePackage.cmake b/targets/apps/LBM/streetTest/CMakePackage.cmake
deleted file mode 100644
index 5d39e3804..000000000
--- a/targets/apps/LBM/streetTest/CMakePackage.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-#FILE ENDINGS
-resetFileEndingsToCollect()
-addCAndCPPFileTypes()
-addFileEndingToCollect("*.cu")
-addFileEndingToCollect("*.cuh")
-
-#GLOB SOURCE FILES IN MY_SRCS
-unset(MY_SRCS)
-includeRecursiveAllFilesFrom(${targetName} ${CMAKE_CURRENT_LIST_DIR})
\ No newline at end of file
diff --git a/targets/libs/Core/3rdPartyLinking.cmake b/targets/libs/Core/3rdPartyLinking.cmake
deleted file mode 100644
index 9c7eff417..000000000
--- a/targets/libs/Core/3rdPartyLinking.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Boost/Link.cmake)
-linkBoost(${targetName} "thread;serialization")
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/MPI/Link.cmake)
-linkMPI(${targetName})
-#include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/JsonCpp/Link.cmake)
-#linkJsonCpp(${targetName})
\ No newline at end of file
diff --git a/targets/libs/Core/CMakeLists.txt b/targets/libs/Core/CMakeLists.txt
deleted file mode 100644
index b27eb99bf..000000000
--- a/targets/libs/Core/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-setTargetNameToFolderName(${CMAKE_CURRENT_LIST_DIR})
-
-MESSAGE( STATUS ${CMAKE_CURRENT_LIST_DIR} )
-
-set(linkDirectories "")
-set(libsToLink "")
-set(includeDirectories ${CMAKE_SOURCE_DIR}/src/${targetName})
-
-#glob files and save in MY_SRCS
-include(CMakePackage.cmake)
-
-include(buildInfo.cmake)
-
-buildLib(${targetName} "${MY_SRCS}" "${linkDirectories}" "${libsToLink}" "${includeDirectories}")
-groupTarget(${targetName} ${libraryFolder})
-
-#Specify the linking to 3rdParty libs
-include(3rdPartyLinking.cmake)
diff --git a/targets/libs/Core/CMakePackage.cmake b/targets/libs/Core/CMakePackage.cmake
deleted file mode 100644
index 96a822d95..000000000
--- a/targets/libs/Core/CMakePackage.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#FILE ENDINGS
-resetFileEndingsToCollect()
-addCAndCPPFileTypes()
-
-#GLOB SOURCE FILES IN MY_SRCS
-unset(MY_SRCS)
-#includeRecursiveAllFilesFrom(${targetName} ${CMAKE_CURRENT_LIST_DIR})
-includeRecursiveProductionFilesFrom(${targetName} ${CMAKE_SOURCE_DIR}/src/${targetName})
\ No newline at end of file
diff --git a/targets/libs/Core/buildInfo.cmake b/targets/libs/Core/buildInfo.cmake
deleted file mode 100644
index 4dd877bae..000000000
--- a/targets/libs/Core/buildInfo.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-set(buildInfoPath ${CMAKE_BINARY_DIR}/buildInfo)
-set(buildInfoFile buildInfo.cpp)
-#set(buildInfoFileHeader buildInfo.h)
-set(buildInfoInput ${CMAKE_CURRENT_LIST_DIR}/buildInfoInput/buildInfo.in.cpp)
-
-include(${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/git/GetGitRevisionDescription.cmake)
-get_git_head_revision(git_branch git_commit_hash)
-
-set(COMPILER_FLAGS "${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}} ${CMAKE_CXX_FLAGS}")
-
-configure_file(${buildInfoInput} ${buildInfoPath}/${buildInfoFile})
-
-include_directories(${buildInfoPath})
-#set(MY_SRCS ${MY_SRCS} ${buildInfoPath}/${buildInfoFile} ${CMAKE_CURRENT_LIST_DIR}/${buildInfoFileHeader})
-set(MY_SRCS ${MY_SRCS} ${buildInfoPath}/${buildInfoFile})
-source_group("" FILES ${buildInfoPath}/${buildInfoFile})
-#source_group("" FILES ${CMAKE_CURRENT_LIST_DIR}/${buildInfoFileHeader})
\ No newline at end of file
diff --git a/targets/libs/Core/buildInfoInput/buildInfo.in.cpp b/targets/libs/Core/buildInfoInput/buildInfo.in.cpp
deleted file mode 100644
index f3df466c5..000000000
--- a/targets/libs/Core/buildInfoInput/buildInfo.in.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "VirtualFluidsDefinitions.h"
-
-namespace buildInfo
-{
- VF_PUBLIC const char *gitCommitHash() { return "@git_commit_hash@"; }
- VF_PUBLIC const char *gitBranch() { return "@git_branch@"; }
- VF_PUBLIC const char *buildType() { return "@CMAKE_BUILD_TYPE@"; }
- VF_PUBLIC const char *compilerFlags() { return "@COMPILER_FLAGS@"; }
- VF_PUBLIC const char *buildMachine() { return "@BUILD_computerName@";}
- VF_PUBLIC const char *projectDir() { return "@CMAKE_SOURCE_DIR@"; }
- VF_PUBLIC const char *binaryDir() { return "@CMAKE_BINARY_DIR@"; }
-}
diff --git a/targets/libs/GksGpu/3rdPartyLinking.cmake b/targets/libs/GksGpu/3rdPartyLinking.cmake
deleted file mode 100644
index ede6d1c72..000000000
--- a/targets/libs/GksGpu/3rdPartyLinking.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Cuda/Link.cmake)
-linkCuda(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/MPI/Link.cmake)
-linkMPI(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/OpenMP/Link.cmake)
-linkOpenMP(${targetName})
diff --git a/targets/libs/GksGpu/CMakeLists.txt b/targets/libs/GksGpu/CMakeLists.txt
deleted file mode 100644
index 477314aa7..000000000
--- a/targets/libs/GksGpu/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-setTargetNameToFolderName(${CMAKE_CURRENT_LIST_DIR})
-
-set(linkDirectories "")
-set(libsToLink GksMeshAdapter Core)
-
-set(includeDirectories ${CMAKE_SOURCE_DIR}/src/${targetName}
- ${CMAKE_SOURCE_DIR}/src
- ${CMAKE_SOURCE_DIR}/src/GksMeshAdapter
- ${CMAKE_SOURCE_DIR}/src/Core )
-
-#glob files and save in MY_SRCS
-include(CMakePackage.cmake)
-
-buildLib(${targetName} "${MY_SRCS}" "${linkDirectories}" "${libsToLink}" "${includeDirectories}")
-groupTarget(${targetName} ${gksLibraryFolder})
-
-#Specify the linking to 3rdParty libs
-include(3rdPartyLinking.cmake)
diff --git a/targets/libs/GksMeshAdapter/3rdPartyLinking.cmake b/targets/libs/GksMeshAdapter/3rdPartyLinking.cmake
deleted file mode 100644
index 838d1037e..000000000
--- a/targets/libs/GksMeshAdapter/3rdPartyLinking.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Cuda/Link.cmake)
-linkCuda(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/MPI/Link.cmake)
-linkMPI(${targetName})
-#include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Boost/Link.cmake)
-#linkBoost(${targetName} "serialization")
diff --git a/targets/libs/GksMeshAdapter/CMakeLists.txt b/targets/libs/GksMeshAdapter/CMakeLists.txt
deleted file mode 100644
index fadfa8657..000000000
--- a/targets/libs/GksMeshAdapter/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-setTargetNameToFolderName(${CMAKE_CURRENT_LIST_DIR})
-
-set(linkDirectories "")
-set(libsToLink GridGenerator Core)
-
-set(includeDirectories ${CMAKE_SOURCE_DIR}/src/${targetName}
- ${CMAKE_SOURCE_DIR}/src
- ${CMAKE_SOURCE_DIR}/src/GridGenerator
- ${CMAKE_SOURCE_DIR}/src/Core )
-
-#glob files and save in MY_SRCS
-include(CMakePackage.cmake)
-
-buildLib(${targetName} "${MY_SRCS}" "${linkDirectories}" "${libsToLink}" "${includeDirectories}")
-groupTarget(${targetName} ${gksLibraryFolder})
-
-#Specify the linking to 3rdParty libs
-include(3rdPartyLinking.cmake)
diff --git a/targets/libs/GksVtkAdapter/CMakePackage.cmake b/targets/libs/GksVtkAdapter/CMakePackage.cmake
deleted file mode 100644
index 7ec316fe0..000000000
--- a/targets/libs/GksVtkAdapter/CMakePackage.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#FILE ENDINGS
-resetFileEndingsToCollect()
-addCAndCPPFileTypes()
-
-#GLOB SOURCE FILES IN MY_SRCS
-unset(MY_SRCS)
-includeRecursiveAllFilesFrom(${targetName} ${CMAKE_CURRENT_LIST_DIR})
-includeRecursiveProductionFilesFrom(${targetName} ${CMAKE_SOURCE_DIR}/src/${targetName})
\ No newline at end of file
diff --git a/targets/libs/GridGenerator/3rdPartyLinking.cmake b/targets/libs/GridGenerator/3rdPartyLinking.cmake
deleted file mode 100644
index 303712437..000000000
--- a/targets/libs/GridGenerator/3rdPartyLinking.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Cuda/Link.cmake)
-linkCuda(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/MPI/Link.cmake)
-linkMPI(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Boost/Link.cmake)
-linkBoost(${targetName} "serialization")
-#include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Metis/Link.cmake)
-#linkMetis(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/OpenMP/Link.cmake)
-linkOpenMP(${targetName})
diff --git a/targets/libs/GridGenerator/CMakeLists.txt b/targets/libs/GridGenerator/CMakeLists.txt
deleted file mode 100644
index 460d60d03..000000000
--- a/targets/libs/GridGenerator/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-setTargetNameToFolderName(${CMAKE_CURRENT_LIST_DIR})
-
-set(linkDirectories "")
-set(libsToLink VirtualFluidsBasics Core)
-
-set(includeDirectories ${CMAKE_SOURCE_DIR}/src/${targetName}
- ${CMAKE_SOURCE_DIR}/src
- ${CMAKE_SOURCE_DIR}/src/VirtualFluidsBasics
- ${CMAKE_SOURCE_DIR}/src/Core )
-
-#glob files and save in MY_SRCS
-include(CMakePackage.cmake)
-
-buildLib(${targetName} "${MY_SRCS}" "${linkDirectories}" "${libsToLink}" "${includeDirectories}")
-groupTarget(${targetName} ${libraryFolder})
-
-set_property(TARGET ${targetName} PROPERTY CUDA_SEPARABLE_COMPILATION ON)
-
-# Specify the linking to 3rdParty libs
-include(3rdPartyLinking.cmake)
diff --git a/targets/libs/GridGenerator/CMakePackage.cmake b/targets/libs/GridGenerator/CMakePackage.cmake
deleted file mode 100644
index 7ec316fe0..000000000
--- a/targets/libs/GridGenerator/CMakePackage.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#FILE ENDINGS
-resetFileEndingsToCollect()
-addCAndCPPFileTypes()
-
-#GLOB SOURCE FILES IN MY_SRCS
-unset(MY_SRCS)
-includeRecursiveAllFilesFrom(${targetName} ${CMAKE_CURRENT_LIST_DIR})
-includeRecursiveProductionFilesFrom(${targetName} ${CMAKE_SOURCE_DIR}/src/${targetName})
\ No newline at end of file
diff --git a/targets/libs/Traffic/CMakePackage.cmake b/targets/libs/Traffic/CMakePackage.cmake
deleted file mode 100644
index 7ec316fe0..000000000
--- a/targets/libs/Traffic/CMakePackage.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#FILE ENDINGS
-resetFileEndingsToCollect()
-addCAndCPPFileTypes()
-
-#GLOB SOURCE FILES IN MY_SRCS
-unset(MY_SRCS)
-includeRecursiveAllFilesFrom(${targetName} ${CMAKE_CURRENT_LIST_DIR})
-includeRecursiveProductionFilesFrom(${targetName} ${CMAKE_SOURCE_DIR}/src/${targetName})
\ No newline at end of file
diff --git a/targets/libs/VirtualFluidsBasics/3rdPartyLinking.cmake b/targets/libs/VirtualFluidsBasics/3rdPartyLinking.cmake
deleted file mode 100644
index 9c7eff417..000000000
--- a/targets/libs/VirtualFluidsBasics/3rdPartyLinking.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Boost/Link.cmake)
-linkBoost(${targetName} "thread;serialization")
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/MPI/Link.cmake)
-linkMPI(${targetName})
-#include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/JsonCpp/Link.cmake)
-#linkJsonCpp(${targetName})
\ No newline at end of file
diff --git a/targets/libs/VirtualFluidsBasics/CMakeLists.txt b/targets/libs/VirtualFluidsBasics/CMakeLists.txt
deleted file mode 100644
index 32d79ad49..000000000
--- a/targets/libs/VirtualFluidsBasics/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-setTargetNameToFolderName(${CMAKE_CURRENT_LIST_DIR})
-
-set(linkDirectories "")
-set(libsToLink Core)
-set(includeDirectories ${CMAKE_SOURCE_DIR}/src/${targetName}
- ${CMAKE_SOURCE_DIR}/src
- ${CMAKE_SOURCE_DIR}/src/Core )
-
-#glob files and save in MY_SRCS
-include(CMakePackage.cmake)
-
-buildLib(${targetName} "${MY_SRCS}" "${linkDirectories}" "${libsToLink}" "${includeDirectories}")
-groupTarget(${targetName} ${libraryFolder})
-
-#Specify the linking to 3rdParty libs
-include(3rdPartyLinking.cmake)
diff --git a/targets/libs/VirtualFluidsBasics/CMakePackage.cmake b/targets/libs/VirtualFluidsBasics/CMakePackage.cmake
deleted file mode 100644
index 96a822d95..000000000
--- a/targets/libs/VirtualFluidsBasics/CMakePackage.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#FILE ENDINGS
-resetFileEndingsToCollect()
-addCAndCPPFileTypes()
-
-#GLOB SOURCE FILES IN MY_SRCS
-unset(MY_SRCS)
-#includeRecursiveAllFilesFrom(${targetName} ${CMAKE_CURRENT_LIST_DIR})
-includeRecursiveProductionFilesFrom(${targetName} ${CMAKE_SOURCE_DIR}/src/${targetName})
\ No newline at end of file
diff --git a/targets/libs/VirtualFluids_GPU/3rdPartyLinking.cmake b/targets/libs/VirtualFluids_GPU/3rdPartyLinking.cmake
deleted file mode 100644
index 6feb9029e..000000000
--- a/targets/libs/VirtualFluids_GPU/3rdPartyLinking.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Cuda/Link.cmake)
-linkCuda(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/MPI/Link.cmake)
-linkMPI(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Boost/Link.cmake)
-linkBoost(${targetName} "serialization")
\ No newline at end of file
diff --git a/targets/libs/VirtualFluids_GPU/CMakeLists.txt b/targets/libs/VirtualFluids_GPU/CMakeLists.txt
deleted file mode 100644
index a21a91764..000000000
--- a/targets/libs/VirtualFluids_GPU/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-setTargetNameToFolderName(${CMAKE_CURRENT_LIST_DIR})
-
-set(linkDirectories "")
-
-IF(MSVC)
- set(libsToLink ws2_32 GridGenerator VirtualFluidsBasics Core Traffic) # ws_32 throws an error on Phoenix
-ELSE(MSVC)
- #set(libsToLink GridGenerator VirtualFluidsBasics Core Traffic)
- set(libsToLink GridGenerator VirtualFluidsBasics Core)
-ENDIF(MSVC)
-
-set(includeDirectories ${CMAKE_SOURCE_DIR}/src/${targetName}
- ${CMAKE_SOURCE_DIR}/src
- ${CMAKE_SOURCE_DIR}/src/GridGenerator
- ${CMAKE_SOURCE_DIR}/src/VirtualFluidsBasics
- ${CMAKE_SOURCE_DIR}/src/Core
- ${CMAKE_SOURCE_DIR}/src/Traffic
- )
-
-#glob files and save in MY_SRCS
-include(CMakePackage.cmake)
-
-#SET(TPN_WIN32 "/EHsc")
-#https://stackoverflow.com/questions/6832666/lnk2019-when-including-asio-headers-solution-generated-with-cmake
-#https://stackoverflow.com/questions/27442885/syntax-error-with-stdnumeric-limitsmax
-
-buildLib(${targetName} "${MY_SRCS}" "${linkDirectories}" "${libsToLink}" "${includeDirectories}")
-groupTarget(${targetName} ${libraryFolder})
-
-IF(MSVC)
- set_target_properties(${targetName} PROPERTIES LINK_FLAGS "/ignore:4251")
-ENDIF(MSVC)
-
-#Specify the linking to 3rdParty libs
-include(3rdPartyLinking.cmake)
diff --git a/targets/libs/VirtualFluids_GPU/CMakePackage.cmake b/targets/libs/VirtualFluids_GPU/CMakePackage.cmake
deleted file mode 100644
index 7ec316fe0..000000000
--- a/targets/libs/VirtualFluids_GPU/CMakePackage.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#FILE ENDINGS
-resetFileEndingsToCollect()
-addCAndCPPFileTypes()
-
-#GLOB SOURCE FILES IN MY_SRCS
-unset(MY_SRCS)
-includeRecursiveAllFilesFrom(${targetName} ${CMAKE_CURRENT_LIST_DIR})
-includeRecursiveProductionFilesFrom(${targetName} ${CMAKE_SOURCE_DIR}/src/${targetName})
\ No newline at end of file
diff --git a/targets/tests/NumericalTests/Tests/NyTest/LogFileInformation/package.include b/targets/tests/NumericalTests/Tests/NyTest/LogFileInformation/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Tests/NyTest/PostProcessingStrategy/package.include b/targets/tests/NumericalTests/Tests/NyTest/PostProcessingStrategy/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Tests/NyTest/package.include b/targets/tests/NumericalTests/Tests/NyTest/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Tests/PhiTest/LogFileInformation/package.include b/targets/tests/NumericalTests/Tests/PhiTest/LogFileInformation/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Tests/PhiTest/PostProcessingStrategy/package.include b/targets/tests/NumericalTests/Tests/PhiTest/PostProcessingStrategy/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Tests/PhiTest/package.include b/targets/tests/NumericalTests/Tests/PhiTest/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/package.include b/targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithAmplitude/package.include b/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithAmplitude/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithBasicData/package.include b/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithBasicData/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/package.include b/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/package.include b/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/Calculator/package.include b/targets/tests/NumericalTests/Utilities/Calculator/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/ColorConsoleOutput/package.include b/targets/tests/NumericalTests/Utilities/ColorConsoleOutput/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/ConfigFileReaderNT/package.include b/targets/tests/NumericalTests/Utilities/ConfigFileReaderNT/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/package.include b/targets/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/package.include b/targets/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/DataWriter/package.include b/targets/tests/NumericalTests/Utilities/DataWriter/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/InitialCondition/package.include b/targets/tests/NumericalTests/Utilities/InitialCondition/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/KernelConfiguration/package.include b/targets/tests/NumericalTests/Utilities/KernelConfiguration/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/package.include b/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/package.include b/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileHead/package.include b/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileHead/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileTimeInformation/package.include b/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileTimeInformation/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/LogFileInformation/SimulationLogFileInformation/package.include b/targets/tests/NumericalTests/Utilities/LogFileInformation/SimulationLogFileInformation/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/LogFileInformation/TestLogFileInformation/package.include b/targets/tests/NumericalTests/Utilities/LogFileInformation/TestLogFileInformation/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/LogFileInformation/package.include b/targets/tests/NumericalTests/Utilities/LogFileInformation/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/LogFileQueue/package.include b/targets/tests/NumericalTests/Utilities/LogFileQueue/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/LogFileWriter/package.include b/targets/tests/NumericalTests/Utilities/LogFileWriter/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/NumericalTestFactory/package.include b/targets/tests/NumericalTests/Utilities/NumericalTestFactory/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/NumericalTestGridReader/package.include b/targets/tests/NumericalTests/Utilities/NumericalTestGridReader/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/NumericalTestSimulation/package.include b/targets/tests/NumericalTests/Utilities/NumericalTestSimulation/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/NumericalTestSuite/package.include b/targets/tests/NumericalTests/Utilities/NumericalTestSuite/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/PostProcessingStrategy/package.include b/targets/tests/NumericalTests/Utilities/PostProcessingStrategy/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/Results/AnalyticalResults/package.include b/targets/tests/NumericalTests/Utilities/Results/AnalyticalResults/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/Results/SimulationResults/package.include b/targets/tests/NumericalTests/Utilities/Results/SimulationResults/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/Results/package.include b/targets/tests/NumericalTests/Utilities/Results/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/SimulationInfo/package.include b/targets/tests/NumericalTests/Utilities/SimulationInfo/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/SimulationParameter/package.include b/targets/tests/NumericalTests/Utilities/SimulationParameter/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/Structs/package.include b/targets/tests/NumericalTests/Utilities/Structs/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/Test/package.include b/targets/tests/NumericalTests/Utilities/Test/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/TestQueue/package.include b/targets/tests/NumericalTests/Utilities/TestQueue/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/TestSimulation/package.include b/targets/tests/NumericalTests/Utilities/TestSimulation/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/Time/package.include b/targets/tests/NumericalTests/Utilities/Time/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/VirtualFluidSimulation/package.include b/targets/tests/NumericalTests/Utilities/VirtualFluidSimulation/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/package.include b/targets/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/package.include
deleted file mode 100644
index e69de29bb..000000000
diff --git a/targets/tests/NumericalTests/package.include b/targets/tests/NumericalTests/package.include
deleted file mode 100644
index e69de29bb..000000000
--
GitLab