From dd8d917c3231d0480b2d631bf5a1d86f87277803 Mon Sep 17 00:00:00 2001 From: Soeren Peters <peters@irmb.tu-bs.de> Date: Tue, 7 Jul 2020 14:49:14 +0200 Subject: [PATCH] Moved all old CmakeMacros --- {gpu/CMakeMacros => CMake/CMakeMacros_old}/Cocoa/Link.cmake | 0 .../CMakeMacros_old}/Environment/environment.cmake | 0 .../CMakeMacros => CMake/CMakeMacros_old}/GMock/FindGMock.cmake | 0 {gpu/CMakeMacros => CMake/CMakeMacros_old}/GMock/Link.cmake | 0 .../CMakeMacros_old}/JsonCpp/FindJsonCpp.cmake | 0 {gpu/CMakeMacros => CMake/CMakeMacros_old}/JsonCpp/Link.cmake | 0 .../CMakeMacros_old}/MacOSXBundle/Info.plist | 0 .../CMakeMacros_old}/MacOSXBundle/MacOSXBundle.cmake | 0 {gpu/CMakeMacros => CMake/CMakeMacros_old}/MathLink/Link.cmake | 0 .../CMakeMacros => CMake/CMakeMacros_old}/Metis/FindMetis.cmake | 0 {gpu/CMakeMacros => CMake/CMakeMacros_old}/Metis/Link.cmake | 0 {gpu/CMakeMacros => CMake/CMakeMacros_old}/Qt/Link.cmake | 0 {gpu/CMakeMacros => CMake/CMakeMacros_old}/README.md | 0 {gpu/CMakeMacros => CMake/CMakeMacros_old}/VTK/Link.cmake | 0 {gpu/CMakeMacros => CMake/CMakeMacros_old}/fftw/FindFftw.cmake | 0 {gpu/CMakeMacros => CMake/CMakeMacros_old}/fftw/Link.cmake | 0 .../CMakeMacros_old}/general/BuildTarget.cmake | 0 .../CMakeMacros_old}/general/BuildTargetUtilities.cmake | 0 .../CMakeMacros_old}/general/EndingsToCollect.cmake | 0 .../CMakeMacros_old}/general/FileUtilities.cmake | 0 .../CMakeMacros_old}/general/FindCompiler.cmake | 0 gpu.cmake | 2 +- gpu/CMakeLists.txt | 2 +- 23 files changed, 2 insertions(+), 2 deletions(-) rename {gpu/CMakeMacros => CMake/CMakeMacros_old}/Cocoa/Link.cmake (100%) rename {gpu/CMakeMacros => CMake/CMakeMacros_old}/Environment/environment.cmake (100%) rename {gpu/CMakeMacros => CMake/CMakeMacros_old}/GMock/FindGMock.cmake (100%) rename {gpu/CMakeMacros => CMake/CMakeMacros_old}/GMock/Link.cmake (100%) rename {gpu/CMakeMacros => CMake/CMakeMacros_old}/JsonCpp/FindJsonCpp.cmake (100%) rename {gpu/CMakeMacros => CMake/CMakeMacros_old}/JsonCpp/Link.cmake (100%) rename {gpu/CMakeMacros => CMake/CMakeMacros_old}/MacOSXBundle/Info.plist (100%) rename {gpu/CMakeMacros => CMake/CMakeMacros_old}/MacOSXBundle/MacOSXBundle.cmake (100%) rename {gpu/CMakeMacros => CMake/CMakeMacros_old}/MathLink/Link.cmake (100%) rename {gpu/CMakeMacros => CMake/CMakeMacros_old}/Metis/FindMetis.cmake (100%) rename {gpu/CMakeMacros => CMake/CMakeMacros_old}/Metis/Link.cmake (100%) rename {gpu/CMakeMacros => CMake/CMakeMacros_old}/Qt/Link.cmake (100%) rename {gpu/CMakeMacros => CMake/CMakeMacros_old}/README.md (100%) rename {gpu/CMakeMacros => CMake/CMakeMacros_old}/VTK/Link.cmake (100%) rename {gpu/CMakeMacros => CMake/CMakeMacros_old}/fftw/FindFftw.cmake (100%) rename {gpu/CMakeMacros => CMake/CMakeMacros_old}/fftw/Link.cmake (100%) rename {gpu/CMakeMacros => CMake/CMakeMacros_old}/general/BuildTarget.cmake (100%) rename {gpu/CMakeMacros => CMake/CMakeMacros_old}/general/BuildTargetUtilities.cmake (100%) rename {gpu/CMakeMacros => CMake/CMakeMacros_old}/general/EndingsToCollect.cmake (100%) rename {gpu/CMakeMacros => CMake/CMakeMacros_old}/general/FileUtilities.cmake (100%) rename {gpu/CMakeMacros => CMake/CMakeMacros_old}/general/FindCompiler.cmake (100%) diff --git a/gpu/CMakeMacros/Cocoa/Link.cmake b/CMake/CMakeMacros_old/Cocoa/Link.cmake similarity index 100% rename from gpu/CMakeMacros/Cocoa/Link.cmake rename to CMake/CMakeMacros_old/Cocoa/Link.cmake diff --git a/gpu/CMakeMacros/Environment/environment.cmake b/CMake/CMakeMacros_old/Environment/environment.cmake similarity index 100% rename from gpu/CMakeMacros/Environment/environment.cmake rename to CMake/CMakeMacros_old/Environment/environment.cmake diff --git a/gpu/CMakeMacros/GMock/FindGMock.cmake b/CMake/CMakeMacros_old/GMock/FindGMock.cmake similarity index 100% rename from gpu/CMakeMacros/GMock/FindGMock.cmake rename to CMake/CMakeMacros_old/GMock/FindGMock.cmake diff --git a/gpu/CMakeMacros/GMock/Link.cmake b/CMake/CMakeMacros_old/GMock/Link.cmake similarity index 100% rename from gpu/CMakeMacros/GMock/Link.cmake rename to CMake/CMakeMacros_old/GMock/Link.cmake diff --git a/gpu/CMakeMacros/JsonCpp/FindJsonCpp.cmake b/CMake/CMakeMacros_old/JsonCpp/FindJsonCpp.cmake similarity index 100% rename from gpu/CMakeMacros/JsonCpp/FindJsonCpp.cmake rename to CMake/CMakeMacros_old/JsonCpp/FindJsonCpp.cmake diff --git a/gpu/CMakeMacros/JsonCpp/Link.cmake b/CMake/CMakeMacros_old/JsonCpp/Link.cmake similarity index 100% rename from gpu/CMakeMacros/JsonCpp/Link.cmake rename to CMake/CMakeMacros_old/JsonCpp/Link.cmake diff --git a/gpu/CMakeMacros/MacOSXBundle/Info.plist b/CMake/CMakeMacros_old/MacOSXBundle/Info.plist similarity index 100% rename from gpu/CMakeMacros/MacOSXBundle/Info.plist rename to CMake/CMakeMacros_old/MacOSXBundle/Info.plist diff --git a/gpu/CMakeMacros/MacOSXBundle/MacOSXBundle.cmake b/CMake/CMakeMacros_old/MacOSXBundle/MacOSXBundle.cmake similarity index 100% rename from gpu/CMakeMacros/MacOSXBundle/MacOSXBundle.cmake rename to CMake/CMakeMacros_old/MacOSXBundle/MacOSXBundle.cmake diff --git a/gpu/CMakeMacros/MathLink/Link.cmake b/CMake/CMakeMacros_old/MathLink/Link.cmake similarity index 100% rename from gpu/CMakeMacros/MathLink/Link.cmake rename to CMake/CMakeMacros_old/MathLink/Link.cmake diff --git a/gpu/CMakeMacros/Metis/FindMetis.cmake b/CMake/CMakeMacros_old/Metis/FindMetis.cmake similarity index 100% rename from gpu/CMakeMacros/Metis/FindMetis.cmake rename to CMake/CMakeMacros_old/Metis/FindMetis.cmake diff --git a/gpu/CMakeMacros/Metis/Link.cmake b/CMake/CMakeMacros_old/Metis/Link.cmake similarity index 100% rename from gpu/CMakeMacros/Metis/Link.cmake rename to CMake/CMakeMacros_old/Metis/Link.cmake diff --git a/gpu/CMakeMacros/Qt/Link.cmake b/CMake/CMakeMacros_old/Qt/Link.cmake similarity index 100% rename from gpu/CMakeMacros/Qt/Link.cmake rename to CMake/CMakeMacros_old/Qt/Link.cmake diff --git a/gpu/CMakeMacros/README.md b/CMake/CMakeMacros_old/README.md similarity index 100% rename from gpu/CMakeMacros/README.md rename to CMake/CMakeMacros_old/README.md diff --git a/gpu/CMakeMacros/VTK/Link.cmake b/CMake/CMakeMacros_old/VTK/Link.cmake similarity index 100% rename from gpu/CMakeMacros/VTK/Link.cmake rename to CMake/CMakeMacros_old/VTK/Link.cmake diff --git a/gpu/CMakeMacros/fftw/FindFftw.cmake b/CMake/CMakeMacros_old/fftw/FindFftw.cmake similarity index 100% rename from gpu/CMakeMacros/fftw/FindFftw.cmake rename to CMake/CMakeMacros_old/fftw/FindFftw.cmake diff --git a/gpu/CMakeMacros/fftw/Link.cmake b/CMake/CMakeMacros_old/fftw/Link.cmake similarity index 100% rename from gpu/CMakeMacros/fftw/Link.cmake rename to CMake/CMakeMacros_old/fftw/Link.cmake diff --git a/gpu/CMakeMacros/general/BuildTarget.cmake b/CMake/CMakeMacros_old/general/BuildTarget.cmake similarity index 100% rename from gpu/CMakeMacros/general/BuildTarget.cmake rename to CMake/CMakeMacros_old/general/BuildTarget.cmake diff --git a/gpu/CMakeMacros/general/BuildTargetUtilities.cmake b/CMake/CMakeMacros_old/general/BuildTargetUtilities.cmake similarity index 100% rename from gpu/CMakeMacros/general/BuildTargetUtilities.cmake rename to CMake/CMakeMacros_old/general/BuildTargetUtilities.cmake diff --git a/gpu/CMakeMacros/general/EndingsToCollect.cmake b/CMake/CMakeMacros_old/general/EndingsToCollect.cmake similarity index 100% rename from gpu/CMakeMacros/general/EndingsToCollect.cmake rename to CMake/CMakeMacros_old/general/EndingsToCollect.cmake diff --git a/gpu/CMakeMacros/general/FileUtilities.cmake b/CMake/CMakeMacros_old/general/FileUtilities.cmake similarity index 100% rename from gpu/CMakeMacros/general/FileUtilities.cmake rename to CMake/CMakeMacros_old/general/FileUtilities.cmake diff --git a/gpu/CMakeMacros/general/FindCompiler.cmake b/CMake/CMakeMacros_old/general/FindCompiler.cmake similarity index 100% rename from gpu/CMakeMacros/general/FindCompiler.cmake rename to CMake/CMakeMacros_old/general/FindCompiler.cmake diff --git a/gpu.cmake b/gpu.cmake index 3d351c3a4..2be43a5ae 100644 --- a/gpu.cmake +++ b/gpu.cmake @@ -102,7 +102,7 @@ enable_language(CUDA) ############################################################# -include(${CMAKE_SOURCE_DIR}/gpu/${cmakeMacroPath}/general/FindCompiler.cmake) +include(${CMAKE_PATH}/CMakeMacros_old/general/FindCompiler.cmake) configure_file(src/gpu/VirtualFluidsDefinitions.in.h VirtualFluidsDefinitions.h) if(MSVC) SET( CMAKE_CXX_FLAGS "/FI${CMAKE_BINARY_DIR}/VirtualFluidsDefinitions.h ${CMAKE_CXX_FLAGS}" ) diff --git a/gpu/CMakeLists.txt b/gpu/CMakeLists.txt index 6b30bad6b..0df8e2d20 100644 --- a/gpu/CMakeLists.txt +++ b/gpu/CMakeLists.txt @@ -30,7 +30,7 @@ endif() ############################################################# ### ENVIRONMENT ### ############################################################# -set(cmakeMacroPath "CMakeMacros") +set(cmakeMacroPath "CMakeMacros_old") #include(${cmakeMacroPath}/Environment/environment.cmake) #CAB -- GitLab