From 8c1c989cf4fab5023f0c0294bb033df04e74704b Mon Sep 17 00:00:00 2001 From: Mike Oliphant Date: Fri, 24 Mar 2023 09:40:11 -0700 Subject: [PATCH] Move dependencies into subdir --- .gitmodules | 6 ++--- CMakeLists.txt | 8 +++---- .../NeuralAmpModelerCore | 0 eigen => deps/eigen | 0 {json => deps/json}/json.hpp | 0 lv2 => deps/lv2 | 0 src/CMakeLists.txt | 22 +++++++++---------- 7 files changed, 18 insertions(+), 18 deletions(-) rename NeuralAmpModelerCore => deps/NeuralAmpModelerCore (100%) rename eigen => deps/eigen (100%) rename {json => deps/json}/json.hpp (100%) rename lv2 => deps/lv2 (100%) diff --git a/.gitmodules b/.gitmodules index 04f12fa..022893f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,10 +1,10 @@ [submodule "lv2"] - path = lv2 + path = deps/lv2 url = https://github.com/lv2/lv2 [submodule "eigen"] - path = eigen + path = deps/eigen url = https://gitlab.com/libeigen/eigen [submodule "NeuralAmpModelerCore"] - path = NeuralAmpModelerCore + path = deps/NeuralAmpModelerCore url = https://github.com/mikeoliphant/NeuralAmpModelerCore branch = devel diff --git a/CMakeLists.txt b/CMakeLists.txt index a574d36..6e18eda 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,10 +19,10 @@ endif() set(NAM_LV2_ID http://github.com/mikeoliphant/neural-amp-modeler-lv2) -include_directories(SYSTEM eigen) -include_directories(SYSTEM lv2/include) -include_directories(SYSTEM NeuralAmpModelerCore/NAM) -include_directories(SYSTEM json) +include_directories(SYSTEM deps/eigen) +include_directories(SYSTEM deps/lv2/include) +include_directories(SYSTEM deps/NeuralAmpModelerCore/NAM) +include_directories(SYSTEM deps/json) add_subdirectory(src) diff --git a/NeuralAmpModelerCore b/deps/NeuralAmpModelerCore similarity index 100% rename from NeuralAmpModelerCore rename to deps/NeuralAmpModelerCore diff --git a/eigen b/deps/eigen similarity index 100% rename from eigen rename to deps/eigen diff --git a/json/json.hpp b/deps/json/json.hpp similarity index 100% rename from json/json.hpp rename to deps/json/json.hpp diff --git a/lv2 b/deps/lv2 similarity index 100% rename from lv2 rename to deps/lv2 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 506be34..ae2899e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,17 +2,17 @@ add_library(neural_amp_modeler MODULE nam_lv2.cpp nam_plugin.cpp nam_plugin.h - ../NeuralAmpModelerCore/NAM/activations.h - ../NeuralAmpModelerCore/NAM/version.h - ../NeuralAmpModelerCore/NAM/lstm.h - ../NeuralAmpModelerCore/NAM/lstm.cpp - ../NeuralAmpModelerCore/NAM/dsp.h - ../NeuralAmpModelerCore/NAM/dsp.cpp - ../NeuralAmpModelerCore/NAM/get_dsp.cpp - ../NeuralAmpModelerCore/NAM/util.cpp - ../NeuralAmpModelerCore/NAM/util.h - ../NeuralAmpModelerCore/NAM/wavenet.cpp - ../NeuralAmpModelerCore/NAM/wavenet.h + ../deps/NeuralAmpModelerCore/NAM/activations.h + ../deps/NeuralAmpModelerCore/NAM/version.h + ../deps/NeuralAmpModelerCore/NAM/lstm.h + ../deps/NeuralAmpModelerCore/NAM/lstm.cpp + ../deps/NeuralAmpModelerCore/NAM/dsp.h + ../deps/NeuralAmpModelerCore/NAM/dsp.cpp + ../deps/NeuralAmpModelerCore/NAM/get_dsp.cpp + ../deps/NeuralAmpModelerCore/NAM/util.cpp + ../deps/NeuralAmpModelerCore/NAM/util.h + ../deps/NeuralAmpModelerCore/NAM/wavenet.cpp + ../deps/NeuralAmpModelerCore/NAM/wavenet.h ) target_compile_features(neural_amp_modeler PUBLIC cxx_std_17)