Skip to content

USE_MALLOCNG and USE_RNNOISE configuration variables #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mymedia2 wants to merge 2 commits into from
Closed

USE_MALLOCNG and USE_RNNOISE configuration variables #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
376dde6
New DESKTOP_APP_USE_MALLOCNG switch
mymedia2 Jun 13, 2021
fa4a1a9
New DESKTOP_APP_USE_RNNOISE switch
mymedia2 Jun 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions external/mallocng/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
add_library(external_mallocng INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_mallocng ALIAS external_mallocng)

set(DESKTOP_APP_USE_MALLOCNG ON CACHE BOOL "Prefer mallocng by musl or use system memory allocator?")
if (NOT DESKTOP_APP_USE_MALLOCNG)
return()
endif()

add_library(external_mallocng_bundled STATIC)
init_target(external_mallocng_bundled "(external)")

Expand Down
13 changes: 11 additions & 2 deletions external/rnnoise/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,18 @@ if (DESKTOP_APP_USE_PACKAGED)
add_library(desktop-app::external_rnnoise ALIAS external_rnnoise)

find_package(PkgConfig REQUIRED)
pkg_check_modules(RNNOISE REQUIRED IMPORTED_TARGET rnnoise)
if (NOT DEFINED DESKTOP_APP_USE_RNNOISE)
pkg_check_modules(RNNOISE IMPORTED_TARGET rnnoise)
elseif (DESKTOP_APP_USE_RNNOISE)
pkg_check_modules(RNNOISE REQUIRED IMPORTED_TARGET rnnoise)
endif()
set(DESKTOP_APP_USE_RNNOISE ${RNNOISE_FOUND} CACHE BOOL "Compile against RNNoise or not?")

target_link_libraries(external_rnnoise INTERFACE PkgConfig::RNNOISE)
if (RNNOISE_FOUND)
target_link_libraries(external_rnnoise INTERFACE PkgConfig::RNNOISE)
else()
target_compile_definitions(external_rnnoise INTERFACE USE_RNNOISE=0)
endif()
else()
add_library(external_rnnoise STATIC IMPORTED GLOBAL)
add_library(desktop-app::external_rnnoise ALIAS external_rnnoise)
Expand Down