Fix missing TBB when linking and using MKL.

Improve cmake files.

Author: PierreMarchand20

CMakeLists.txt

@@ -96,6 +96,26 @@ find_package(OpenMP)
 find_package(BLAS REQUIRED)
 message(STATUS "Blas implementation:" "${BLAS_LIBRARIES}")
 
+set(BLAS_VENDOR "Unknown")
+foreach(lib ${BLAS_LIBRARIES})
+    if(lib MATCHES "mkl")
+        set(BLAS_VENDOR "Intel MKL")
+    elseif(lib MATCHES "openblas")
+        set(BLAS_VENDOR "OpenBLAS")
+    elseif(lib MATCHES "atlas")
+        set(BLAS_VENDOR "ATLAS")
+    elseif(lib MATCHES "vecLib" OR lib MATCHES "Accelerate")
+        set(BLAS_VENDOR "Apple Accelerate")
+    elseif(lib MATCHES "blas")
+        set(BLAS_VENDOR "Netlib BLAS")
+    endif()
+endforeach()
+message(STATUS "Detected BLAS vendor: ${BLAS_VENDOR}")
+set(IS_INTEL_MKL FALSE)
+if("${BLAS_VENDOR}" STREQUAL "Intel MKL")
+    set(IS_INTEL_MKL TRUE)
+endif()
+
 # LAPACK
 find_package(LAPACK)
 message(STATUS "Lapack implementation:" "${LAPACK_LIBRARIES}")
@@ -124,6 +144,10 @@ if("${BLA_VENDOR}" STREQUAL "Intel10_32"
     target_compile_definitions(htool INTERFACE "-DHPDDM_MKL -DHTOOL_MKL")
 endif()
 
+if(IS_INTEL_MKL)
+    target_link_libraries(htool INTERFACE "-ltbb")
+endif()
+
 # For headers to show in IDE
 if(NOT "${CMAKE_VERSION}" VERSION_LESS 3.1)
     target_sources(htool INTERFACE ${htool_include_dir})

cmake/HtoolConfig.cmake.in

@@ -1,4 +1,10 @@
 @PACKAGE_INIT@
 
+include(CMakeFindDependencyMacro)
+find_package(BLAS REQUIRED)
+find_package(LAPACK)
+find_package(OpenMP)
+find_package(MPI)
+
 include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
 check_required_components("@PROJECT_NAME@")

examples/CMakeLists.txt

@@ -10,13 +10,17 @@ add_executable(Use_hmatrix use_hmatrix.cpp)
 target_link_libraries(Use_hmatrix htool)
 add_dependencies(build-examples Use_hmatrix)
 
-add_executable(Use_distributed_operator use_distributed_operator.cpp)
-target_link_libraries(Use_distributed_operator htool)
-add_dependencies(build-examples Use_distributed_operator)
+if(MPI_FOUND)
+    add_executable(Use_distributed_operator use_distributed_operator.cpp)
+    target_link_libraries(Use_distributed_operator htool)
+    add_dependencies(build-examples Use_distributed_operator)
+endif()
 
-add_executable(Use_ddm_solver use_ddm_solver.cpp)
-target_link_libraries(Use_ddm_solver htool)
-add_dependencies(build-examples Use_ddm_solver)
+if(MPI_FOUND AND HPDDM_FOUND)
+    add_executable(Use_ddm_solver use_ddm_solver.cpp)
+    target_link_libraries(Use_ddm_solver htool)
+    add_dependencies(build-examples Use_ddm_solver)
+endif()
 
 add_executable(Compression_comparison compression_comparison.cpp)
 target_link_libraries(Compression_comparison htool)

tests/functional_tests/CMakeLists.txt

@@ -18,10 +18,14 @@ add_custom_target(build-tests-hmatrix)
 add_dependencies(build-tests build-tests-hmatrix)
 add_subdirectory(hmatrix)
 
-add_custom_target(build-tests-distributed-operator)
-add_dependencies(build-tests build-tests-distributed-operator)
-add_subdirectory(distributed_operator)
+if(MPI_FOUND)
+    add_custom_target(build-tests-distributed-operator)
+    add_dependencies(build-tests build-tests-distributed-operator)
+    add_subdirectory(distributed_operator)
+endif()
 
-add_custom_target(build-tests-solvers)
-add_dependencies(build-tests build-tests-solvers)
-add_subdirectory(solvers)
+if(MPI_FOUND AND HPDDM_FOUND)
+    add_custom_target(build-tests-solvers)
+    add_dependencies(build-tests build-tests-solvers)
+    add_subdirectory(solvers)
+endif()