Use system's spdlog based on cmake option

llloret · Jun 4, 2020 · 99a9d77 · dvzrv · Aug 11, 2020 · 99a9d77
1 parent a1205b4
commit 99a9d77
Show file tree

Hide file tree

Showing 108 changed files with 14,067 additions and 11,396 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -43,6 +43,7 @@ before_install:
   - iflin sudo apt-get update
   - iflin sudo apt-get install --yes libboost-system-dev libboost-program-options-dev
   - iflin sudo apt-get install --yes libasound2-dev
+  - iflin sudo apt-get install --yes spdlog
   - iflin sudo apt-get install --yes build-essential gcc-4.9 g++-4.9 cmake pkg-config
   - iflin sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.9
   - iflin sudo update-alternatives --auto gcc

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,16 +11,22 @@ if(NOT MSVC)
     endif(APPLE)
 endif(NOT MSVC)
 
-if(APPLE)
+set(USE_SYSTEM_SPDLOG OFF CACHE BOOL "Use the system's spdlog instead of the bundled one")
 
+if(APPLE)
 elseif(UNIX)
     find_package(ALSA REQUIRED)
 endif(APPLE)
 
+if (USE_SYSTEM_SPDLOG)
+    find_package(spdlog REQUIRED)
+else(USE_SYSTEM_SPDLOG)
+    include_directories(${PROJECT_SOURCE_DIR}/external_libs/spdlog-0.16.3/include)
+endif(USE_SYSTEM_SPDLOG)
 
 set(oscpack_path ${PROJECT_SOURCE_DIR}/external_libs/oscpack_1_1_0)
 add_subdirectory(${oscpack_path})
-include_directories(${oscpack_path} ${PROJECT_SOURCE_DIR}/external_libs/spdlog-0.11.0/include JuceLibraryCode JuceLibraryCode/modules  ${PROJECT_SOURCE_DIR}/external_libs/cxxopts)
+include_directories(${oscpack_path} JuceLibraryCode JuceLibraryCode/modules  ${PROJECT_SOURCE_DIR}/external_libs/cxxopts)
 
 set(m2o_sources
     src/m2o.cpp

diff --git a/external_libs/spdlog-0.11.0/CMakeLists.txt b/external_libs/spdlog-0.11.0/CMakeLists.txt
diff --git a/external_libs/spdlog-0.11.0/example/jni/example.cpp b/external_libs/spdlog-0.11.0/example/jni/example.cpp
diff --git a/external_libs/spdlog-0.11.0/include/spdlog/sinks/ansicolor_sink.h b/external_libs/spdlog-0.11.0/include/spdlog/sinks/ansicolor_sink.h
diff --git a/external_libs/spdlog-0.11.0/tests/file_log.cpp b/external_libs/spdlog-0.11.0/tests/file_log.cpp