From 144a659f2aa7af6be1541846fc14b9b2e7195503 Mon Sep 17 00:00:00 2001 From: Soeren Peters <peters@irmb.tu-bs.de> Date: Tue, 7 Jul 2020 13:39:35 +0200 Subject: [PATCH] Removed unused fodler --- gpu/targets/libs/Core/3rdPartyLinking.cmake | 6 ---- gpu/targets/libs/Core/CMakeLists.txt | 18 ---------- gpu/targets/libs/Core/CMakePackage.cmake | 8 ----- gpu/targets/libs/Core/package.include | 0 .../libs/GridGenerator/3rdPartyLinking.cmake | 10 ------ gpu/targets/libs/GridGenerator/CMakeLists.txt | 20 ----------- .../libs/GridGenerator/CMakePackage.cmake | 8 ----- .../libs/Traffic/3rdPartyLinking.cmake | 10 ------ gpu/targets/libs/Traffic/CMakeLists.txt | 19 ---------- gpu/targets/libs/Traffic/CMakePackage.cmake | 8 ----- .../VirtualFluids_GPU/3rdPartyLinking.cmake | 6 ---- .../libs/VirtualFluids_GPU/CMakeLists.txt | 35 ------------------- .../libs/VirtualFluids_GPU/CMakePackage.cmake | 8 ----- 13 files changed, 156 deletions(-) delete mode 100644 gpu/targets/libs/Core/3rdPartyLinking.cmake delete mode 100644 gpu/targets/libs/Core/CMakeLists.txt delete mode 100644 gpu/targets/libs/Core/CMakePackage.cmake delete mode 100644 gpu/targets/libs/Core/package.include delete mode 100644 gpu/targets/libs/GridGenerator/3rdPartyLinking.cmake delete mode 100644 gpu/targets/libs/GridGenerator/CMakeLists.txt delete mode 100644 gpu/targets/libs/GridGenerator/CMakePackage.cmake delete mode 100644 gpu/targets/libs/Traffic/3rdPartyLinking.cmake delete mode 100644 gpu/targets/libs/Traffic/CMakeLists.txt delete mode 100644 gpu/targets/libs/Traffic/CMakePackage.cmake delete mode 100644 gpu/targets/libs/VirtualFluids_GPU/3rdPartyLinking.cmake delete mode 100644 gpu/targets/libs/VirtualFluids_GPU/CMakeLists.txt delete mode 100644 gpu/targets/libs/VirtualFluids_GPU/CMakePackage.cmake diff --git a/gpu/targets/libs/Core/3rdPartyLinking.cmake b/gpu/targets/libs/Core/3rdPartyLinking.cmake deleted file mode 100644 index 9c7eff417..000000000 --- a/gpu/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/gpu/targets/libs/Core/CMakeLists.txt b/gpu/targets/libs/Core/CMakeLists.txt deleted file mode 100644 index b27eb99bf..000000000 --- a/gpu/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/gpu/targets/libs/Core/CMakePackage.cmake b/gpu/targets/libs/Core/CMakePackage.cmake deleted file mode 100644 index 96a822d95..000000000 --- a/gpu/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/gpu/targets/libs/Core/package.include b/gpu/targets/libs/Core/package.include deleted file mode 100644 index e69de29bb..000000000 diff --git a/gpu/targets/libs/GridGenerator/3rdPartyLinking.cmake b/gpu/targets/libs/GridGenerator/3rdPartyLinking.cmake deleted file mode 100644 index 303712437..000000000 --- a/gpu/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/gpu/targets/libs/GridGenerator/CMakeLists.txt b/gpu/targets/libs/GridGenerator/CMakeLists.txt deleted file mode 100644 index 460d60d03..000000000 --- a/gpu/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/gpu/targets/libs/GridGenerator/CMakePackage.cmake b/gpu/targets/libs/GridGenerator/CMakePackage.cmake deleted file mode 100644 index 7ec316fe0..000000000 --- a/gpu/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/gpu/targets/libs/Traffic/3rdPartyLinking.cmake b/gpu/targets/libs/Traffic/3rdPartyLinking.cmake deleted file mode 100644 index e7057893a..000000000 --- a/gpu/targets/libs/Traffic/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/gpu/targets/libs/Traffic/CMakeLists.txt b/gpu/targets/libs/Traffic/CMakeLists.txt deleted file mode 100644 index 82f7620df..000000000 --- a/gpu/targets/libs/Traffic/CMakeLists.txt +++ /dev/null @@ -1,19 +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/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}) - -# Specify the linking to 3rdParty libs -include(3rdPartyLinking.cmake) diff --git a/gpu/targets/libs/Traffic/CMakePackage.cmake b/gpu/targets/libs/Traffic/CMakePackage.cmake deleted file mode 100644 index 7ec316fe0..000000000 --- a/gpu/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/gpu/targets/libs/VirtualFluids_GPU/3rdPartyLinking.cmake b/gpu/targets/libs/VirtualFluids_GPU/3rdPartyLinking.cmake deleted file mode 100644 index 6feb9029e..000000000 --- a/gpu/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/gpu/targets/libs/VirtualFluids_GPU/CMakeLists.txt b/gpu/targets/libs/VirtualFluids_GPU/CMakeLists.txt deleted file mode 100644 index a21a91764..000000000 --- a/gpu/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/gpu/targets/libs/VirtualFluids_GPU/CMakePackage.cmake b/gpu/targets/libs/VirtualFluids_GPU/CMakePackage.cmake deleted file mode 100644 index 7ec316fe0..000000000 --- a/gpu/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 -- GitLab