Merge pull request 'Little Refactorings in the 3rd cmake part.' (#20) from...

Merge pull request 'Little Refactorings in the 3rd cmake part.' (#20) from peters/VirtualFluids_dev:develop into develop

3rdParty/googletest/version.txt

+release v1.10.0, 03.10.2019
+
+https://github.com/google/googletest/releases/tag/release-1.10.0

3rdParty/jsoncpp/amalgamate.py

@@ -48,13 +48,13 @@ class AmalgamationFile:
         f.close()
 
 def amalgamate_source(source_top_dir=None,
-                       target_source_path=None,
+                       target_VF_SRC_DIR=None,
                        header_include_path=None):
     """Produces amalgated source.
        Parameters:
            source_top_dir: top-directory
-           target_source_path: output .cpp path
-           header_include_path: generated header path relative to target_source_path.
+           target_VF_SRC_DIR: output .cpp path
+           header_include_path: generated header path relative to target_VF_SRC_DIR.
     """
     print("Amalgating header...")
     header = AmalgamationFile(source_top_dir)
@@ -77,7 +77,7 @@ def amalgamate_source(source_top_dir=None,
     header.add_file("include/json/assertions.h")
     header.add_text("#endif //ifndef JSON_AMALGATED_H_INCLUDED")
 
-    target_header_path = os.path.join(os.path.dirname(target_source_path), header_include_path)
+    target_header_path = os.path.join(os.path.dirname(target_VF_SRC_DIR), header_include_path)
     print("Writing amalgated header to %r" % target_header_path)
     header.write_to(target_header_path)
 
@@ -98,7 +98,7 @@ def amalgamate_source(source_top_dir=None,
     header.add_file("include/json/forwards.h")
     header.add_text("#endif //ifndef JSON_FORWARD_AMALGATED_H_INCLUDED")
 
-    target_forward_header_path = os.path.join(os.path.dirname(target_source_path),
+    target_forward_header_path = os.path.join(os.path.dirname(target_VF_SRC_DIR),
                                                forward_header_include_path)
     print("Writing amalgated forward header to %r" % target_forward_header_path)
     header.write_to(target_forward_header_path)
@@ -123,8 +123,8 @@ def amalgamate_source(source_top_dir=None,
     source.add_file(os.path.join(lib_json, "json_value.cpp"))
     source.add_file(os.path.join(lib_json, "json_writer.cpp"))
 
-    print("Writing amalgated source to %r" % target_source_path)
-    source.write_to(target_source_path)
+    print("Writing amalgated source to %r" % target_VF_SRC_DIR)
+    source.write_to(target_VF_SRC_DIR)
 
 def main():
     usage = """%prog [options]
@@ -133,7 +133,7 @@ Generate a single amalgated source and header file from the sources.
     from optparse import OptionParser
     parser = OptionParser(usage=usage)
     parser.allow_interspersed_args = False
-    parser.add_option("-s", "--source", dest="target_source_path", action="store", default="dist/jsoncpp.cpp",
+    parser.add_option("-s", "--source", dest="target_VF_SRC_DIR", action="store", default="dist/jsoncpp.cpp",
         help="""Output .cpp source path. [Default: %default]""")
     parser.add_option("-i", "--include", dest="header_include_path", action="store", default="json/json.h",
         help="""Header include path. Used to include the header from the amalgated source file. [Default: %default]""")
@@ -143,7 +143,7 @@ Generate a single amalgated source and header file from the sources.
     options, args = parser.parse_args()
 
     msg = amalgamate_source(source_top_dir=options.top_dir,
-                             target_source_path=options.target_source_path,
+                             target_VF_SRC_DIR=options.target_VF_SRC_DIR,
                              header_include_path=options.header_include_path)
     if msg:
         sys.stderr.write(msg + "\n")

3rdParty/jsoncpp/devtools/tarball.py

@@ -37,13 +37,13 @@ def make_tarball(tarball_path, sources, base_dir, prefix_dir=''):
     with closing(tarfile.TarFile.open(tarball_path, 'w:gz',
             compresslevel=compression)) as tar:
         for source in sources:
-            source_path = source
+            VF_SRC_DIR = source
             if os.path.isdir(source):
-                for dirpath, dirnames, filenames in os.walk(source_path):
+                for dirpath, dirnames, filenames in os.walk(VF_SRC_DIR):
                     visit(tar, dirpath, filenames)
             else:
-                path_in_tar = archive_name(source_path)
-                tar.add(source_path, path_in_tar)      # filename, arcname
+                path_in_tar = archive_name(VF_SRC_DIR)
+                tar.add(VF_SRC_DIR, path_in_tar)      # filename, arcname
 
 def decompress(tarball_path, base_dir):
     """Decompress the gzipped tarball into directory base_dir.

CMake/3rd.cmake

+include(${VF_CMAKE_DIR}/3rd/boost.cmake)
+include(${VF_CMAKE_DIR}/3rd/cuda.cmake)
+include(${VF_CMAKE_DIR}/3rd/gmock.cmake)
+include(${VF_CMAKE_DIR}/3rd/mpi.cmake)
+include(${VF_CMAKE_DIR}/3rd/OpenMP.cmake)
\ No newline at end of file

CMake/3rd/OpenMP.cmake

+function (linkOpenMP)
 
-find_package(OpenMP)
-if (OPENMP_FOUND)
-	#set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-	#set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-    #set (CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Xcompiler ${OpenMP_CXX_FLAGS}")
-endif()
+	find_package(OpenMP REQUIRED)
 
-#message (Cuda Flags: ${OpenMP_CXX_FLAGS})
-vf_get_library_name(library_name)
-if(OpenMP_CXX_FOUND)
-	target_link_libraries(${library_name} PUBLIC OpenMP::OpenMP_CXX)
-endif()
+	if(OpenMP_CXX_FOUND)
+		vf_get_library_name(library_name)
+		target_link_libraries(${library_name} PUBLIC OpenMP::OpenMP_CXX)
+	endif()
+
+endfunction()
\ No newline at end of file

CMake/3rd/boost.cmake

-macro(linkBoost components)
+function(linkBoost components)
   if(BUILD_SHARED_LIBS)
      if (WIN32)
          set(Boost_USE_STATIC_LIBS ON)
@@ -17,8 +17,9 @@ macro(linkBoost components)
 	add_definitions( -DBOOST_ALL_NO_LIB )
 #	add_definitions( -DBOOST_ALL_DYN_LINK )
   endif()
+
   vf_get_library_name(library_name)
   find_package( Boost REQUIRED COMPONENTS ${components})
   target_include_directories(${library_name} PRIVATE ${Boost_INCLUDE_DIR})
   target_link_libraries(${library_name} PRIVATE ${Boost_LIBRARIES})
-endmacro(linkBoost)
+endfunction()

CMake/3rd/cuda.cmake

 
+function(linkCUDA)
 
     find_path(CUDA_CUT_INCLUDE_DIR
       helper_cuda.h
@@ -11,8 +12,7 @@
     vf_get_library_name(library_name)
     target_include_directories(${library_name} PRIVATE ${CUDA_INCLUDE_DIRS} ${CUDA_CUT_INCLUDE_DIR})
 
-	#set_property(TARGET ${targetName} PROPERTY CUDA_SEPARABLE_COMPILATION ON)
-	#set_property(TARGET ${targetName} PROPERTY CUDA_64_BIT_DEVICE_CODE ON)
-	
-    #set(CUDA_NVCC_FLAGS "-G" CACHE TYPE INTERNAL FORCE)
-    #set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS}; -gencode arch=compute_13,code=sm_13 )
+    # set the following properties only for specific targets
+    # set_property(TARGET ${targetName} PROPERTY CUDA_SEPARABLE_COMPILATION ON)
+    # set_property(TARGET ${targetName} PROPERTY CUDA_64_BIT_DEVICE_CODE ON)
+endfunction()
\ No newline at end of file

CMake/3rd/gmock.cmake

@@ -3,14 +3,15 @@
 #  Note: gmock has to be build by the project itself (Located in 3rd).
 #################################################################################
 
-vf_get_library_test_name(library_name)
-target_link_libraries(${library_name} PRIVATE gtest gmock gmock_main)
+function (linkGMOCK)
+    vf_get_library_test_name(library_name)
+    target_link_libraries(${library_name} PRIVATE gtest gmock gmock_main)
 
-
-if(BUILD_SHARED_LIBS)
-    # add compile option according to
-    # https://github.com/google/googletest/blob/master/googletest/README.md#as-a-shared-library-dll
-    set_target_properties(${library_name}
-            PROPERTIES
-            COMPILE_DEFINITIONS "GTEST_LINKED_AS_SHARED_LIBRARY=1")
-endif()
+    if(BUILD_SHARED_LIBS)
+        # add compile option according to
+        # https://github.com/google/googletest/blob/master/googletest/README.md#as-a-shared-library-dll
+        set_target_properties(${library_name}
+                PROPERTIES
+                COMPILE_DEFINITIONS "GTEST_LINKED_AS_SHARED_LIBRARY=1")
+    endif()
+endfunction()
\ No newline at end of file

CMake/3rd/mpi.cmake

+function (linkMPI)
 
+    find_package(MPI REQUIRED)
 
-vf_get_library_name(library_name)
+    vf_get_library_name(library_name)
+    target_include_directories(${library_name} PUBLIC ${MPI_CXX_INCLUDE_PATH})
+    target_link_libraries(${library_name} PRIVATE MPI::MPI_CXX)
 
-find_package(MPI REQUIRED)
-target_include_directories(${library_name} PUBLIC ${MPI_CXX_INCLUDE_PATH})
+endfunction()
\ No newline at end of file
-
-#target_link_libraries(${library_name} PUBLIC ${MPI_CXX_LIBRARIES})
-
-target_link_libraries(${library_name} PRIVATE MPI::MPI_CXX)

CMake/VirtualFluidsMacros.cmake

@@ -222,7 +222,7 @@ function(vf_add_tests)
     target_include_directories(${library_test_name} PRIVATE ${VF_SRC_DIR})
 
     # link googlemock
-    include(${VF_CMAKE_DIR}/3rd/gmock.cmake)
+    linkGMOCK()
 
 endfunction()
 

CMakeLists.txt

@@ -53,6 +53,7 @@ include(CMakePrintHelpers)
 include(${VF_CMAKE_DIR}/CMakeCABMacros.cmake)
 include(${VF_CMAKE_DIR}/FileUtilities.cmake)
 include(${VF_CMAKE_DIR}/VirtualFluidsMacros.cmake)
+include(${VF_CMAKE_DIR}/3rd.cmake)
 
 include(${VF_CMAKE_DIR}/CMakeMacros_old/general/FindCompiler.cmake)
 configure_file(src/basics/VirtualFluidsDefinitions.in.h ${CMAKE_BINARY_DIR}/VirtualFluidsDefinitions.h)

apps/cpu/LidDrivenCavityCPU/CMakeLists.txt

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

apps/gpu/LBM/DrivenCavity/CMakeLists.txt

@@ -4,7 +4,4 @@ PROJECT(DrivenCavity)
 
 vf_add_library(BUILDTYPE binary DEPENDS VirtualFluids_GPU basics GridGenerator FILES DrivenCavity.cpp )
 
-include (${VF_CMAKE_DIR}/3rd/cuda.cmake)
-include (${VF_CMAKE_DIR}/3rd/mpi.cmake)
-include (${VF_CMAKE_DIR}/3rd/boost.cmake)
-linkBoost ("serialization")
+linkCUDA()

apps/gpu/LBM/TGV_3D/3rdPartyLinking.cmake

-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/MPI/Link.cmake)
-linkMPI(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Cuda/Link.cmake)
-linkCuda(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Boost/Link.cmake)
-linkBoost(${targetName} "serialization")
-#include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Metis/Link.cmake)
-#linkMetis(${targetName})
-
-if(HULC.BUILD_JSONCPP)
-  include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/JsonCpp/Link.cmake)
-  linkJsonCpp(${targetName})
-endif()
\ No newline at end of file

apps/gpu/LBM/TGV_3D/CMakeLists.txt

@@ -2,14 +2,4 @@ PROJECT(TGV_3D)
 
 vf_add_library(BUILDTYPE binary DEPENDS basics VirtualFluids_GPU GridGenerator FILES TGV_3D.cpp)
 
-include (${VF_CMAKE_DIR}/3rd/cuda.cmake)
-include (${VF_CMAKE_DIR}/3rd/mpi.cmake)
-include (${VF_CMAKE_DIR}/3rd/boost.cmake)
-linkBoost ("serialization")
-
-vf_get_library_name(library_name)
-target_include_directories(${library_name} PRIVATE "${CMAKE_SOURCE_DIR}/src/basics")
-target_include_directories(${library_name} PRIVATE "${CMAKE_SOURCE_DIR}/src/gpu")
-target_include_directories(${library_name} PRIVATE "${CMAKE_SOURCE_DIR}/src/gpu/VirtualFluids_GPU")
-target_include_directories(${library_name} PRIVATE "${CMAKE_SOURCE_DIR}/src/gpu/GridGenerator")
-target_include_directories(${library_name} PRIVATE "${CMAKE_SOURCE_DIR}/src/basics/Core")
+linkCUDA()
\ No newline at end of file

apps/gpu/LBM/TGV_3D/CMakePackage.cmake

-#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

apps/gpu/LBM/TGV_3D_MultiGPU/3rdPartyLinking.cmake

-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/MPI/Link.cmake)
-linkMPI(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Cuda/Link.cmake)
-linkCuda(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Boost/Link.cmake)
-linkBoost(${targetName} "serialization")
-#include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Metis/Link.cmake)
-#linkMetis(${targetName})
-
-if(HULC.BUILD_JSONCPP)
-  include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/JsonCpp/Link.cmake)
-  linkJsonCpp(${targetName})
-endif()
\ No newline at end of file

apps/gpu/LBM/TGV_3D_MultiGPU/CMakeLists.txt

@@ -2,14 +2,4 @@ PROJECT(TGV_3D_MultiGPU)
 
 vf_add_library(BUILDTYPE binary DEPENDS basics VirtualFluids_GPU GridGenerator FILES TGV_3D_MultiGPU.cpp)
 
-include (${VF_CMAKE_DIR}/3rd/cuda.cmake)
-include (${VF_CMAKE_DIR}/3rd/mpi.cmake)
-include (${VF_CMAKE_DIR}/3rd/boost.cmake)
-linkBoost ("serialization")
-
-vf_get_library_name(library_name)
-target_include_directories(${library_name} PRIVATE "${CMAKE_SOURCE_DIR}/src/basics")
-target_include_directories(${library_name} PRIVATE "${CMAKE_SOURCE_DIR}/src/gpu")
-target_include_directories(${library_name} PRIVATE "${CMAKE_SOURCE_DIR}/src/gpu/VirtualFluids_GPU")
-target_include_directories(${library_name} PRIVATE "${CMAKE_SOURCE_DIR}/src/gpu/GridGenerator")
-target_include_directories(${library_name} PRIVATE "${CMAKE_SOURCE_DIR}/src/basics/Core")
+linkCUDA()
\ No newline at end of file

apps/gpu/LBM/TGV_3D_MultiGPU/CMakePackage.cmake

-#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

apps/gpu/LBM/gridGeneratorTest/3rdPartyLinking.cmake

-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/MPI/Link.cmake)
-linkMPI(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Cuda/Link.cmake)
-linkCuda(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Boost/Link.cmake)
-linkBoost(${targetName} "serialization")
-#include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Metis/Link.cmake)
-#linkMetis(${targetName})
-
-if(HULC.BUILD_JSONCPP)
-  include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/JsonCpp/Link.cmake)
-  linkJsonCpp(${targetName})
-endif()
\ No newline at end of file