Merge pull request 'Add public link library support.' (#45) from...

Merge pull request 'Add public link library support.' (#45) from peters/VirtualFluids_dev:develop into develop

Reviewed-on: https://git.irmb.bau.tu-bs.de/VirtualFluids/VirtualFluids_dev/pulls/45

CMake/VirtualFluidsMacros.cmake

@@ -90,7 +90,8 @@ endfunction()
 ## parameter:
 ## NAME      - Name of the target. If not passed the name is vf_get_library_name().
 ## BUILDTYPE - STATIC; SHARED; EXECUTABLE
-## DEPENDS   - libraries to link
+## PUBLIC_LINK  - public libraries to link
+## PRIVATE_LINK - private libraries to link
 ## FILES     - adds these files to the target
 ## FOLDER    - adds all files in these folders to the targets
 ## EXCLUDE   - excludes these files from the target
@@ -109,7 +110,7 @@ function(vf_add_library)
 
     set( options )
     set( oneValueArgs )
-    set( multiValueArgs NAME BUILDTYPE DEPENDS FILES FOLDER EXCLUDE)
+    set( multiValueArgs NAME BUILDTYPE PUBLIC_LINK PRIVATE_LINK FILES FOLDER EXCLUDE)
     cmake_parse_arguments( ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
 
     if(${ARG_NAME})
@@ -151,9 +152,13 @@ function(vf_add_library)
     #################################################################
     ###   ADDITIONAL LINK LIBRARIES                               ###
     #################################################################
-    status_lib("Link Depending Libraries: ${ARG_DEPENDS}")
-    if (ARG_DEPENDS)
-        target_link_libraries(${library_name} PRIVATE ${ARG_DEPENDS})
+    status_lib("Link Depending Libraries: ${ARG_PUBLIC_LINK}")
+    status_lib("Link Depending Libraries: ${ARG_PRIVATE_LINK}")
+    if (ARG_PUBLIC_LINK)
+        target_link_libraries(${library_name} PUBLIC ${ARG_PUBLIC_LINK})
+    endif()
+    if (ARG_PRIVATE_LINK)
+        target_link_libraries(${library_name} PRIVATE ${ARG_PRIVATE_LINK})
     endif()
 
     #################################################################

CMake/cmake_config_files/TESLA01.config.cmake

@@ -9,9 +9,3 @@ SET(BOOST_LIBRARYDIR  "C:\\Libraries\\boost_1_65_1\\lib" CACHE PATH "BOOST_LIBRA
 
 SET(VTK_DIR "C:/Libraries/VTK-8.0.1/build")
 
-#################################################################################
-#  METIS
-#################################################################################
-SET(METIS_INCLUDEDIR "C:/Libraries/metis-5.1.0//include")
-SET(METIS_DEBUG_LIBRARY "C:/Libraries/metis-5.1.0/build/libmetis/Debug/metis.lib")
-SET(METIS_RELEASE_LIBRARY "C:/Libraries/metis-5.1.0/build/libmetis/Release/metis.lib")

apps/cpu/LaminarTubeFlow/CMakeLists.txt

 
 PROJECT(ltf)
 
-vf_add_library(BUILDTYPE binary DEPENDS VirtualFluidsCore muparser basics ${MPI_CXX_LIBRARIES} FILES ltf.cpp )
+vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore muparser basics ${MPI_CXX_LIBRARIES} FILES ltf.cpp )
 
 vf_get_library_name (library_name)
 target_include_directories(${library_name} PRIVATE ${APPS_ROOT_CPU})
\ No newline at end of file

apps/cpu/LidDrivenCavity/CMakeLists.txt

 
 PROJECT(LidDrivenCavity)
 
-vf_add_library(NAME LidDrivenCavityCPU BUILDTYPE binary DEPENDS VirtualFluidsCore basics muparser FILES LidDrivenCavity.cpp)
+vf_add_library(NAME LidDrivenCavityCPU BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore FILES LidDrivenCavity.cpp)

apps/cpu/pChannel/CMakeLists.txt

@@ -2,4 +2,4 @@ PROJECT(PChannel)
 
 INCLUDE(${APPS_ROOT}/IncludsList.cmake) 
 
-vf_add_library(BUILDTYPE binary DEPENDS VirtualFluidsCore VirtualFluidsBasic FILES pChannel.cpp)
+vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore VirtualFluidsBasic FILES pChannel.cpp)

apps/gpu/GKS/Flame7cm/CMakeLists.txt

 PROJECT(Flame7cm)
 
-vf_add_library(BUILDTYPE binary DEPENDS basics GridGenerator GksMeshAdapter GksVtkAdapter GksGpu FILES Flame7cm.cpp )
+vf_add_library(BUILDTYPE binary PRIVATE_LINK basics GridGenerator GksMeshAdapter GksVtkAdapter GksGpu FILES Flame7cm.cpp )
 
 include (${VF_CMAKE_DIR}/3rd/cuda.cmake)
 include (${VF_CMAKE_DIR}/3rd/mpi.cmake)

apps/gpu/LBM/DrivenCavity/CMakeLists.txt

@@ -2,6 +2,6 @@ PROJECT(DrivenCavity)
 
 #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-DOMPI_SKIP_MPICXX" )
 
-vf_add_library(BUILDTYPE binary DEPENDS VirtualFluids_GPU basics GridGenerator FILES DrivenCavity.cpp )
+vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluids_GPU basics GridGenerator FILES DrivenCavity.cpp )
 
 linkCUDA()

apps/gpu/LBM/TGV_3D/CMakeLists.txt

 PROJECT(TGV_3D)
 
-vf_add_library(BUILDTYPE binary DEPENDS basics VirtualFluids_GPU GridGenerator FILES TGV_3D.cpp)
+vf_add_library(BUILDTYPE binary PRIVATE_LINK basics VirtualFluids_GPU GridGenerator FILES TGV_3D.cpp)
 
 linkCUDA()

apps/gpu/LBM/TGV_3D_MultiGPU/CMakeLists.txt

 PROJECT(TGV_3D_MultiGPU)
 
-vf_add_library(BUILDTYPE binary DEPENDS basics VirtualFluids_GPU GridGenerator FILES TGV_3D_MultiGPU.cpp)
+vf_add_library(BUILDTYPE binary PRIVATE_LINK basics VirtualFluids_GPU GridGenerator FILES TGV_3D_MultiGPU.cpp)
 
 linkCUDA()

apps/gpu/LBM/TrafficTest/CMakeLists.txt

@@ -6,7 +6,7 @@ set(includeDirectories "${CMAKE_SOURCE_DIR}/src"
 
 
 
-vf_add_library(BUILDTYPE binary DEPENDS Traffic basics GridGenerator)
+vf_add_library(BUILDTYPE binary PRIVATE_LINK Traffic basics GridGenerator)
 
 vf_get_library_name(library_name)
 target_include_directories(${library_name} PRIVATE "${CMAKE_SOURCE_DIR}/src/basics")

apps/gpu/LBM/gridGeneratorTest/CMakeLists.txt

 PROJECT(GridGeneratorTest)
 
-vf_add_library(BUILDTYPE binary DEPENDS basics VirtualFluids_GPU GridGenerator FILES gridGenerator.cpp)
+vf_add_library(BUILDTYPE binary PRIVATE_LINK basics VirtualFluids_GPU GridGenerator FILES gridGenerator.cpp)
 
 linkCUDA()

apps/gpu/LidDrivenCavity/CMakeLists.txt

@@ -3,4 +3,4 @@
 PROJECT(LidDrivenCavity)
 
 
-vf_add_library(BUILDTYPE binary DEPENDS basics GridGenerator VirtualFluids_GPU GksMeshAdapter GksGpu FILES LidDrivenCavity.cpp)
+vf_add_library(BUILDTYPE binary PRIVATE_LINK basics GridGenerator VirtualFluids_GPU GksMeshAdapter GksGpu FILES LidDrivenCavity.cpp)

apps/gpu/tests/NumericalTestPostProcessing/CMakeLists.txt

 project(NumericalTestPostProcessing)
 
-vf_add_library(BUILDTYPE binary DEPENDS VirtualFluids_GPU basics cudart_static)
+vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluids_GPU basics cudart_static)
 
 vf_get_library_name(library_name)
 groupTarget(${library_name} ${testFolder})

apps/gpu/tests/NumericalTests/CMakeLists.txt

 project(NumericalTestsGPU)
 set(collectTestFiles ON)
-vf_add_library(BUILDTYPE binary DEPENDS VirtualFluids_GPU GridGenerator basics fftw3 gtest gmock gmock_main cudart_static)
+vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluids_GPU GridGenerator basics fftw3 gtest gmock gmock_main cudart_static)
 
 vf_get_library_name(library_name)
 groupTarget(${library_name} ${testFolder})

src/cpu/VirtualFluidsCore/CMakeLists.txt

@@ -23,7 +23,7 @@ IF(${USE_DEM_COUPLING})
    INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../DemCoupling/DemCoupling.cmake)
 ENDIF()
 
-vf_add_library(BUILDTYPE static DEPENDS basics muparser ${MPI_LIBRARY} ${CAB_ADDITIONAL_LINK_LIBRARIES})
+vf_add_library(BUILDTYPE static PUBLIC_LINK basics muparser ${CAB_ADDITIONAL_LINK_LIBRARIES})
 
 vf_get_library_name(library_name)
 

src/gpu/GksGpu/CMakeLists.txt

 
-vf_add_library(BUILDTYPE shared DEPENDS basics GksMeshAdapter)
+vf_add_library(BUILDTYPE shared PRIVATE_LINK basics GksMeshAdapter)
 
 linkCUDA()
 linkMPI()

src/gpu/GksMeshAdapter/CMakeLists.txt

 
 
-vf_add_library(BUILDTYPE shared DEPENDS basics GridGenerator)
+vf_add_library(BUILDTYPE shared PRIVATE_LINK basics GridGenerator)

src/gpu/GksVtkAdapter/CMakeLists.txt

 
 
-vf_add_library(BUILDTYPE shared DEPENDS basics GksGpu)
+vf_add_library(BUILDTYPE shared PRIVATE_LINK basics GksGpu)
 
 include (${VF_CMAKE_DIR}/3rd/vtk.cmake)
\ No newline at end of file

src/gpu/GridGenerator/CMakeLists.txt

 
 
-vf_add_library(BUILDTYPE shared DEPENDS basics)
+vf_add_library(BUILDTYPE shared PRIVATE_LINK basics)
 
 linkCUDA()
 linkOpenMP()

src/gpu/Traffic/CMakeLists.txt

 
 
-vf_add_library(BUILDTYPE shared DEPENDS GridGenerator basics)
+vf_add_library(BUILDTYPE shared PRIVATE_LINK GridGenerator basics)
 
 linkCUDA()
\ No newline at end of file