NeuralPi

commit 1e888909f5f46aa4e30489e66adecde57e40785c
parent 2ab0957a1b2e73d6c9cd55eea2ea87746011841e
Author: Keith Bloemer <32459398+GuitarML@users.noreply.github.com>
Date:   Wed, 21 Jul 2021 17:22:33 -0500

Merge pull request #7 from Chowdhury-DSP/lv2

Enable LV2 builds on Linux
Diffstat:
M
.gitmodules
 | 
6
++----
M
CMakeLists.txt
 | 
9
++++++++-
M
modules/CMakeLists.txt
 | 
7
+------
D
modules/DISTRHO-JUCE
 | 
1
-

4 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -3,10 +3,8 @@
 	url = https://github.com/jatinchowdhury18/RTNeural
 [submodule "modules/JUCE"]
 	path = modules/JUCE
-	url = https://github.com/juce-framework/JUCE.git
-[submodule "modules/DISTRHO-JUCE"]
-	path = modules/DISTRHO-JUCE
-	url = https://github.com/Chowdhury-DSP/DISTRHO-JUCE.git
+	url = https://github.com/lv2-porting-project/JUCE.git
+	branch = lv2
 [submodule "modules/json"]
 	path = modules/json
 	url = https://github.com/nlohmann/json.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,12 +10,19 @@ add_subdirectory(modules/RTNeural)
 add_subdirectory(modules)
 include_directories(modules)
 
+set(JUCE_FORMATS AU VST3 Standalone)
+
+# Build LV2 only on Linux
+if(UNIX AND NOT APPLE)
+    message(STATUS "Building LV2 plugin format")
+    list(APPEND JUCE_FORMATS LV2)
+endif()
 
 juce_add_plugin(NeuralPi
     COMPANY_NAME GuitarML
     PLUGIN_MANUFACTURER_CODE GtML
     PLUGIN_CODE Npi3 
-    FORMATS AU VST3 Standalone LV2
+    FORMATS ${JUCE_FORMATS}
     ProductName "NeuralPi"
     LV2_URI https://github.com/GuitarML/NeuralPi
     ICON_BIG resources/logo.png
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
@@ -1,9 +1,4 @@
-# use DISTRHO-JUCE on Linux to support LV2
-if(UNIX AND NOT APPLE)
-    add_subdirectory(DISTRHO-JUCE)
-else()
-    add_subdirectory(JUCE)
-endif()
+add_subdirectory(JUCE)
 
 include(cmake/SubprojectVersion.cmake)
 subproject_version(JUCE juce_version)
diff --git a/modules/DISTRHO-JUCE b/modules/DISTRHO-JUCE
@@ -1 +0,0 @@
-Subproject commit 3bc7305ed68285902cac3d006beecd1c38c3f1fb