1 From 42eda1afc1cfb0506b02baae894fb32f7e21755d Mon Sep 17 00:00:00 2001
2 From: ckie <git-525ff67@ckie.dev>
3 Date: Fri, 10 Mar 2023 04:39:38 +0200
4 Subject: [PATCH] Avoid using vendored dependencies we have in nixpkgs
7 CMakeLists.txt | 12 ++++--------
8 1 file changed, 4 insertions(+), 8 deletions(-)
10 diff --git a/CMakeLists.txt b/CMakeLists.txt
11 index 136e7b0..5416da1 100644
14 @@ -246,8 +246,6 @@ qt6_add_resources(RESOURCES_OBJ resources/qml.qrc)
15 qt6_add_big_resources(RESOURCES_OBJ resources/other.qrc)
16 set_property(SOURCE "${RESOURCES_OBJ}" PROPERTY SKIP_AUTOMOC ON)
18 -set(ARMADILLO_INCLUDE_DIR external/armadillo/include)
19 -set(TOMLPP_INCLUDE_DIR external/tomlplusplus/include)
21 ### SEARCH AUDIO MODULES
23 @@ -334,17 +332,15 @@ target_include_directories(in-formant SYSTEM PRIVATE ${ARMADILLO_INCLUDE_DIR} ${
24 target_link_libraries(in-formant PRIVATE Eigen3::Eigen ${FFTW_LIBRARIES} Qt6::Charts Qt6::Quick Qt6::QuickControls2 Qt6::QuickTemplates2 Qt6::Qml Qt6::Widgets Qt6::OpenGL Qt6::Gui Qt6::Core)
25 target_link_directories(in-formant PRIVATE ${FFTW_LIBRARY_DIRS})
27 -set(BUILD_SHARED_LIBS TRUE)
28 -add_subdirectory(external/freetype EXCLUDE_FROM_ALL)
29 +find_package(Freetype)
30 target_link_libraries(in-formant PRIVATE freetype)
31 -set(BUILD_SHARED_LIBS)
33 add_subdirectory(external/rpmalloc EXCLUDE_FROM_ALL)
34 target_link_libraries(in-formant PRIVATE rpcxx_only)
36 -add_subdirectory(external/libsamplerate)
37 -target_link_libraries(in-formant PRIVATE lsr)
38 -target_include_directories(in-formant PRIVATE external/libsamplerate/src)
40 +find_library(LIBSAMPLERATE_LIBRARY NAMES samplerate libsamplerate-0 samplerate-0)
41 +target_link_libraries(in-formant PRIVATE ${LIBSAMPLERATE_LIBRARY})
43 target_compile_definitions(in-formant PRIVATE
44 -DINFORMANT_VERSION=${CUR_VERSION} -DARMA_DONT_USE_WRAPPER