Use system/vcpkg spdlog if not fallback to fetchcontent

pradeep · pradeep · commit 955152b6570c · 2021-07-06T12:27:05.000+05:30
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -54,6 +54,7 @@ find_package(CBLAS)
 find_package(LAPACKE)
 find_package(Doxygen)
 find_package(MKL)
+find_package(spdlog 1.8.5 QUIET)
 
 include(boost_package)
 
@@ -153,6 +154,7 @@ mark_as_advanced(
   GIT
   Forge_DIR
   glad_DIR
+  spdlog_DIR
   FG_BUILD_OFFLINE
   )
 mark_as_advanced(CLEAR CUDA_VERSION)
@@ -182,13 +184,21 @@ endif()
 #forge is included in ALL target if AF_BUILD_FORGE is ON
 #otherwise, forge is not built at all
 include(AFconfigure_forge_dep)
-FetchContent_Declare(
-  ${spdlog_prefix}
-  GIT_REPOSITORY https://github.com/gabime/spdlog.git
-  GIT_TAG        v1.0.0
-)
-af_dep_check_and_populate(${spdlog_prefix})
-
+add_library(af_spdlog INTERFACE)
+if(TARGET spdlog::spdlog_header_only)
+  target_include_directories(af_spdlog
+    SYSTEM INTERFACE
+    $<TARGET_PROPERTY:spdlog::spdlog_header_only,INTERFACE_INCLUDE_DIRECTORIES>
+    )
+else()
+  FetchContent_Declare(
+    ${spdlog_prefix}
+    GIT_REPOSITORY https://github.com/gabime/spdlog.git
+    GIT_TAG        v1.8.5
+  )
+  af_dep_check_and_populate(${spdlog_prefix})
+  target_include_directories(af_spdlog INTERFACE "${${spdlog_prefix}_SOURCE_DIR}/include")
+endif()
 
 if(NOT TARGET glad::glad)
   FetchContent_Declare(
@@ -220,9 +230,6 @@ configure_file(
     ${ArrayFire_BINARY_DIR}/version.hpp
 )
 
-set(SPDLOG_BUILD_TESTING OFF CACHE INTERNAL "Disable testing in spdlog")
-add_subdirectory(${${spdlog_prefix}_SOURCE_DIR} ${${spdlog_prefix}_BINARY_DIR} EXCLUDE_FROM_ALL)
-
 # when crosscompiling use the bin2cpp file from the native bin directory
 if(CMAKE_CROSSCOMPILING)
   set(NATIVE_BIN_DIR "NATIVE_BIN_DIR-NOTFOUND"
@@ -247,7 +254,11 @@ else()
                              ${ArrayFire_SOURCE_DIR}/include
                              ${ArrayFire_BINARY_DIR}/include
                              ${ArrayFire_SOURCE_DIR}/src/backend)
-  target_link_libraries(bin2cpp PRIVATE spdlog)
+  if(TARGET spdlog::spdlog_header_only)
+    target_link_libraries(bin2cpp PRIVATE spdlog::spdlog_header_only)
+  else()
+    target_link_libraries(bin2cpp PRIVATE af_spdlog)
+  endif()
   export(TARGETS bin2cpp FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake)
 endif()
 
diff --git a/src/api/unified/CMakeLists.txt b/src/api/unified/CMakeLists.txt
@@ -100,8 +100,8 @@ target_include_directories(af
 
 target_link_libraries(af
   PRIVATE
+    af_spdlog
     cpp_api_interface
-    spdlog
     Threads::Threads
     Boost::boost
     ${CMAKE_DL_LIBS}
diff --git a/src/backend/common/CMakeLists.txt b/src/backend/common/CMakeLists.txt
@@ -79,7 +79,7 @@ endif()
 
 target_link_libraries(afcommon_interface
   INTERFACE
-    spdlog
+    af_spdlog
     Boost::boost
     ${CMAKE_DL_LIBS}
 )
diff --git a/src/backend/cuda/CMakeLists.txt b/src/backend/cuda/CMakeLists.txt
@@ -113,6 +113,7 @@ cuda_include_directories(
   ${ArrayFire_SOURCE_DIR}/src/api/c
   ${ArrayFire_SOURCE_DIR}/src/backend
   ${COMMON_INTERFACE_DIRS}
+  $<TARGET_PROPERTY:af_spdlog,INTERFACE_INCLUDE_DIRECTORIES>
   )
 if(CUDA_VERSION_MAJOR VERSION_LESS 11)
   FetchContent_Declare(
@@ -323,6 +324,7 @@ if(UNIX)
 
   target_link_libraries(af_cuda_static_cuda_library
     PRIVATE
+      af_spdlog
       Boost::boost
       ${CMAKE_DL_LIBS}
       ${cusolver_lib}
@@ -338,7 +340,6 @@ if(UNIX)
   if(CUDA_VERSION VERSION_GREATER 10.0)
     target_link_libraries(af_cuda_static_cuda_library
       PRIVATE
-        spdlog
         ${CUDA_cublasLt_static_LIBRARY})
   endif()
   if(CUDA_VERSION VERSION_GREATER 9.5)
diff --git a/src/backend/opencl/kernel/scan_by_key/CMakeLists.txt b/src/backend/opencl/kernel/scan_by_key/CMakeLists.txt
@@ -36,7 +36,7 @@ foreach(SBK_BINARY_OP ${SBK_BINARY_OPS})
         ../common
         ../../../include
         ${CMAKE_CURRENT_BINARY_DIR}
-        $<TARGET_PROPERTY:spdlog,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:af_spdlog,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:OpenCL::OpenCL,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:OpenCL::cl2hpp,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:Boost::boost,INTERFACE_INCLUDE_DIRECTORIES>
diff --git a/vcpkg.json b/vcpkg.json
@@ -19,7 +19,18 @@
             "platform": "!windows"
         },
         "glad",
-        "intel-mkl"
+        "intel-mkl",
+        "spdlog"
+    ],
+    "overrides": [
+       {
+           "name": "fmt",
+           "version": "6.2.1"
+       },
+        {
+            "name": "spdlog",
+            "version": "1.6.1"
+        }
     ],
     "features": {
         "cuda": {

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ endif()`
`79`	`79`
`80`	`80`	`target_link_libraries(afcommon_interface`
`81`	`81`	`INTERFACE`
`82`		`- spdlog`
	`82`	`+ af_spdlog`
`83`	`83`	`Boost::boost`
`84`	`84`	`${CMAKE_DL_LIBS}`
`85`	`85`	`)`