From d4578792d6a44a92eb49cab04a3981eafc227aa6 Mon Sep 17 00:00:00 2001
From: Gustav Andersson <gustav@elk.audio>
Date: Mon, 27 Mar 2023 10:30:40 +0200
Subject: [PATCH] Changing twine build and include step

---
 .gitmodules    |  2 +-
 CMakeLists.txt | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index f8b31b1..13aa366 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,4 +6,4 @@
 	url = https://github.com/gabime/spdlog.git
 [submodule "twine"]
 	path = twine
-	url = http://github.com/elk-audio/twine.git
+	url = ../twine.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 066325e..57a9eb3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,9 +35,18 @@ set(ELKLOG_RT_QUEUE_SIZE 1024 CACHE STRING "Size of realtime log queue")
 
 set(TWINE_WITH_TESTS OFF CACHE BOOL "" FORCE)
 
-if (ELKLOG_USE_INCLUDED_TWINE)
+if (${ELKLOG_USE_INCLUDED_TWINE})
+    set(TWINE_WITH_TESTS OFF CACHE BOOL "")
     add_subdirectory(twine)
+    set(TWINE_LIB twine)
+else()
+    find_path(TWINE_PATH NAMES "twine/twine.h")
+    find_library(TWINE_LIB
+                 NAMES twine
+                 PATHS /usr/lib /usr/local/lib
+                 )
 endif()
+
 add_subdirectory(third-party)
 
 ###################
@@ -45,7 +54,7 @@ add_subdirectory(third-party)
 ###################
 
 add_library(elklog STATIC src/elklog.cpp)
-target_include_directories(elklog PUBLIC include)
+target_include_directories(elklog PUBLIC include ${TWINE_PATH})
 set_target_properties(elklog spdlog PROPERTIES POSITION_INDEPENDENT_CODE ON)
 target_compile_features(elklog PUBLIC cxx_std_17)
 target_compile_definitions(elklog PUBLIC -DELKLOG_FILE_SIZE=${ELKLOG_FILE_SIZE}
@@ -56,7 +65,7 @@ if(ELKLOG_MULTI_THREADED_RT_LOGGING)
     target_compile_definitions(elklog PUBLIC -DELKLOG_MULTI_THREADED_RT_LOGGING=1)
 endif()
 
-target_link_libraries(elklog fifo spdlog twine::twine)
+target_link_libraries(elklog fifo spdlog ${TWINE_LIB})
 
 ###########
 #  Tests  #