Make the importer a library of its own

plugins/CMakeLists.txt

@@ -1,15 +1,10 @@
 add_library(plugins-common STATIC EXCLUDE_FROM_ALL
     "common/plugin/MessageUtils.h"
-    "common/plugin/MessageUtils.cpp"
+    "common/plugin/MessageUtils.cpp")
-    "common/plugin/ForeignInstrument.h"
-    "common/plugin/ForeignInstrument.cpp"
-    "common/plugin/foreign_instruments/AudioFile.h"
-    "common/plugin/foreign_instruments/AudioFile.cpp")
 target_include_directories(plugins-common PUBLIC "common")
 target_link_libraries(plugins-common
     PUBLIC sfizz::spin_mutex
-    PUBLIC sfizz::filesystem absl::strings
+    PUBLIC sfizz::filesystem absl::strings)
-    PRIVATE sfizz::pugixml absl::memory)
 add_library(sfizz::plugins-common ALIAS plugins-common)
 
 if((SFIZZ_LV2 AND SFIZZ_LV2_UI) OR SFIZZ_VST)

plugins/lv2/CMakeLists.txt

@@ -21,7 +21,7 @@ source_group("Turtle Files" FILES
 add_library(${LV2PLUGIN_PRJ_NAME} MODULE
     ${PROJECT_NAME}.cpp
     ${LV2PLUGIN_TTL_SRC_FILES})
-target_link_libraries(${LV2PLUGIN_PRJ_NAME} PRIVATE sfizz::sfizz sfizz::plugins-common)
+target_link_libraries(${LV2PLUGIN_PRJ_NAME} PRIVATE sfizz::sfizz sfizz::import sfizz::plugins-common)
 
 if(SFIZZ_LV2_UI)
     add_library(${LV2PLUGIN_PRJ_NAME}_ui MODULE

plugins/lv2/sfizz.cpp

@@ -34,7 +34,7 @@
 
 #include "sfizz_lv2.h"
 
-#include "plugin/ForeignInstrument.h"
+#include "sfizz/import/ForeignInstrument.h"
 
 #include <lv2/atom/atom.h>
 #include <lv2/atom/forge.h>

plugins/vst/CMakeLists.txt

@@ -62,6 +62,7 @@ if(WIN32)
 endif()
 target_link_libraries(${VSTPLUGIN_PRJ_NAME}
     PRIVATE sfizz::sfizz
+    PRIVATE sfizz::import
     PRIVATE sfizz::editor
     PRIVATE sfizz::plugins-common
     PRIVATE sfizz::pugixml sfizz::filesystem)
@@ -200,7 +201,8 @@ elseif(SFIZZ_AU)
         "${APPLE_COREMIDI_LIBRARY}")
 
     target_link_libraries(${AUPLUGIN_PRJ_NAME}
-        PRIVATE ${PROJECT_NAME}::${PROJECT_NAME}
+        PRIVATE sfizz::sfizz
+        PRIVATE sfizz::import
         PRIVATE sfizz::editor
         PRIVATE sfizz::plugins-common
         PRIVATE sfizz::pugixml sfizz::filesystem)

plugins/vst/SfizzVstProcessor.cpp

@@ -9,7 +9,7 @@
 #include "SfizzVstState.h"
 #include "SfizzVstParameters.h"
 #include "SfizzFileScan.h"
-#include "plugin/ForeignInstrument.h"
+#include "sfizz/import/ForeignInstrument.h"
 #include "base/source/fstreamer.h"
 #include "pluginterfaces/vst/ivstevents.h"
 #include "pluginterfaces/vst/ivstparameterchanges.h"

src/CMakeLists.txt

@@ -242,6 +242,24 @@ if(SFIZZ_RELEASE_ASSERTS)
     target_compile_definitions(sfizz_messaging PUBLIC "SFIZZ_ENABLE_RELEASE_ASSERT=1")
 endif()
 
+# Import library
+set(SFIZZ_IMPORT_HEADERS
+    sfizz/import/ForeignInstrument.h
+    sfizz/import/foreign_instruments/AudioFile.h)
+
+set(SFIZZ_IMPORT_SOURCES
+    sfizz/import/ForeignInstrument.cpp
+    sfizz/import/foreign_instruments/AudioFile.cpp)
+
+add_library(sfizz_import STATIC)
+add_library(sfizz::import ALIAS sfizz_import)
+target_sources(sfizz_import PRIVATE
+    ${SFIZZ_IMPORT_HEADERS} ${SFIZZ_IMPORT_SOURCES})
+target_include_directories(sfizz_import PUBLIC ".")
+target_link_libraries(sfizz_import
+    PUBLIC absl::strings absl::memory sfizz::filesystem
+    PRIVATE sfizz::pugixml)
+
 # Sfizz spinlock mutex
 add_library(sfizz_spin_mutex STATIC
     sfizz/utility/spin_mutex/spin_mutex.h