Fixed issue where concurrentqueue lib is not found when using prebuil…

…d binaries
anira-project · Nov 16, 2024 · 07c18f0 · 07c18f0
1 parent 4637a4c
commit 07c18f0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -105,7 +105,6 @@ FetchContent_Declare(
 
 FetchContent_MakeAvailable(concurrentqueue)
 
-
 # ==============================================================================
 # Build the library
 # ==============================================================================

diff --git a/Config.cmake.in b/Config.cmake.in
@@ -5,6 +5,8 @@ message(STATUS "Configuring anira")
 set(ANIRA_WITH_LIBTORCH @ANIRA_WITH_LIBTORCH@)
 set(ANIRA_WITH_BENCHMARK @ANIRA_WITH_BENCHMARK@)
 
+find_package(concurrentqueue REQUIRED)
+
 # Find the dependencies
 if (ANIRA_WITH_LIBTORCH)
     find_package(Torch REQUIRED)

diff --git a/cmake/install.cmake b/cmake/install.cmake
@@ -6,9 +6,11 @@
 include(GNUInstallDirs)
 
 # include the public headers of the anira library for the install target
+# TODO: File PR so that the concurrentqueue library does not have to be included that way
 target_include_directories(${PROJECT_NAME}
     PUBLIC
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/concurrentqueue/moodycamel>
 )
 
 # This will be problematic anyway since symbols are not found when linking the torch libraries privately

diff --git a/include/anira/scheduler/Context.h b/include/anira/scheduler/Context.h
@@ -10,7 +10,7 @@
 #include "InferenceThread.h"
 #include "../PrePostProcessor.h"
 #include "../utils/HostAudioConfig.h"
-#include "concurrentqueue.h"
+#include <concurrentqueue.h>
 
 #ifdef USE_LIBTORCH
     #include "../backends/LibTorchProcessor.h"

diff --git a/include/anira/scheduler/InferenceThread.h b/include/anira/scheduler/InferenceThread.h
@@ -8,7 +8,7 @@
 #include "../system/HighPriorityThread.h"
 #include "../utils/AudioBuffer.h"
 #include "SessionElement.h"
-#include "concurrentqueue.h"
+#include <concurrentqueue.h>
 #ifdef __x86_64__
 #include <immintrin.h>
 #endif