Merge branch 'feature/clean_3rd_cmake_macros' into develop
* feature/clean_3rd_cmake_macros: Add 3rd library cmake functions. Fix gpu cell type. Add public include directories. CMake: rename the directory variables in a consistent way. Remove redundant PointerDefinition file. Make the cmake project more flexible while removing the CMAKE_SOURCE_DIR usage. Remove all old unused cmake files. Update gitignore file. Fix cell type to unsigned int. Adapt basics CMakeLists according to develop. Adapt open_source basics to develop. Remove unnecessary files in basics. # Conflicts: # CMake/VirtualFluidsMacros.cmake # CMakeLists.txt # apps/cpu/LidDrivenCavityCPU/CMakeLists.txt # apps/gpu/LidDrivenCavity/CMakeLists.txt # apps/gpu/LidDrivenCavity/LidDrivenCavity.cpp # cpu.cmake # gpu.cmake # src/basics/CMakeLists.txt # src/cpu/VirtualFluidsCore/CMakeLists.txt # src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp # src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.h # src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp # src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h # src/gpu/GksGpu/CMakeLists.txt # src/gpu/GksMeshAdapter/CMakeLists.txt # src/gpu/GridGenerator/CMakeLists.txt # src/gpu/VirtualFluids_GPU/CMakeLists.txt # src/gpu/VirtualFluids_GPU/LBM/Simulation.h # src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp # src/gpu/VirtualFluids_GPU/Parameter/Parameter.h
No related branches found
No related tags found
Showing
- 3rdParty/jsoncpp/amalgamate.py 9 additions, 9 deletions3rdParty/jsoncpp/amalgamate.py
- 3rdParty/jsoncpp/devtools/tarball.py 4 additions, 4 deletions3rdParty/jsoncpp/devtools/tarball.py
- CMake/3rd.cmake 5 additions, 0 deletionsCMake/3rd.cmake
- CMake/3rd/OpenMP.cmake 8 additions, 11 deletionsCMake/3rd/OpenMP.cmake
- CMake/3rd/boost.cmake 3 additions, 2 deletionsCMake/3rd/boost.cmake
- CMake/3rd/cuda.cmake 5 additions, 5 deletionsCMake/3rd/cuda.cmake
- CMake/3rd/gmock.cmake 11 additions, 10 deletionsCMake/3rd/gmock.cmake
- CMake/3rd/mpi.cmake 6 additions, 7 deletionsCMake/3rd/mpi.cmake
- CMake/VirtualFluidsMacros.cmake 1 addition, 1 deletionCMake/VirtualFluidsMacros.cmake
- CMakeLists.txt 1 addition, 0 deletionsCMakeLists.txt
- apps/cpu/LidDrivenCavityCPU/CMakeLists.txt 8 additions, 0 deletionsapps/cpu/LidDrivenCavityCPU/CMakeLists.txt
- apps/gpu/LidDrivenCavity/CMakeLists.txt 6 additions, 0 deletionsapps/gpu/LidDrivenCavity/CMakeLists.txt
- apps/gpu/LidDrivenCavity/LidDrivenCavity.cpp 367 additions, 0 deletionsapps/gpu/LidDrivenCavity/LidDrivenCavity.cpp
- cpu.cmake 5 additions, 2 deletionscpu.cmake
- gpu.cmake 0 additions, 11 deletionsgpu.cmake
- src/basics/CMakeLists.txt 2 additions, 1 deletionsrc/basics/CMakeLists.txt
- src/basics/Core/Input/Input.h 2 additions, 0 deletionssrc/basics/Core/Input/Input.h
- src/cpu/VirtualFluidsCore/CMakeLists.txt 0 additions, 6 deletionssrc/cpu/VirtualFluidsCore/CMakeLists.txt
- src/gpu/GksGpu/CMakeLists.txt 4 additions, 4 deletionssrc/gpu/GksGpu/CMakeLists.txt
- src/gpu/GksMeshAdapter/CMakeLists.txt 1 addition, 9 deletionssrc/gpu/GksMeshAdapter/CMakeLists.txt
Loading
Please register or sign in to comment