Package: lizardfs / 3.12.0+dfsg-3

system-spdlog.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
Last-Update: 2018-02-03
Forwarded: no
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Description: use system "libspdlog-dev"; prevents build-time download.

--- a/cmake/Libraries.cmake
+++ b/cmake/Libraries.cmake
@@ -6,12 +6,15 @@
                     "https://github.com/google/googletest/archive/release-1.7.0.zip"
                     "ef5e700c8a0f3ee123e2e0209b8b4961")
 endif()
 
+if(DOWNLOAD_SPDLOG)
 download_external(SPDLOG "spdlog-0.14.0"
                   "https://github.com/gabime/spdlog/archive/v0.14.0.zip"
                   "f213d83c466aa7044a132e2488d71b11"
                   "spdlog-1")
+endif()
+find_package(spdlog CONFIG REQUIRED)
 
 # Find standard libraries
 find_package(Socket REQUIRED)
 find_package(Threads REQUIRED)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -278,9 +278,8 @@
 if(ZLIB_FOUND)
   include_directories(${ZLIB_INCLUDE_DIRS})
 endif()
 include_directories(src) # Allow paths relative to src, eg. #include common/crc.h
-include_directories(external/spdlog-0.14.0/include)
 link_directories( ${LINK_DIRECTORIES} ${FUSE_LIBRARY_DIR} )
 add_subdirectory(external)
 add_subdirectory(src/admin)
 add_subdirectory(src/common)