mirror of
https://gitlab.com/samplehive/sample-hive.git
synced 2026-08-21 14:36:23 +02:00
Merge branch 'nimius-testing-patch-44800' into 'testing'
Fixed compilation error for spdlog. See merge request samplehive/sample-hive!10
This commit is contained in:
+5
-8
@@ -266,16 +266,13 @@ endif
|
|||||||
snd_subproject = cmake.subproject('libsndfile', options: snd_opts)
|
snd_subproject = cmake.subproject('libsndfile', options: snd_opts)
|
||||||
snd = snd_subproject.dependency('sndfile')
|
snd = snd_subproject.dependency('sndfile')
|
||||||
|
|
||||||
spdlog = dependency('spdlog', version: '>=1.9.2', required: false)
|
|
||||||
|
|
||||||
if not spdlog.found()
|
spdlog_subproject = subproject('spdlog',
|
||||||
spdlog_subproject = subproject('spdlog',
|
default_options: [
|
||||||
default_options: [
|
'default_library=static',
|
||||||
'default_library=static',
|
'compile_library=true',])
|
||||||
'compile_library=true',])
|
|
||||||
|
|
||||||
spdlog = spdlog_subproject.get_variable('spdlog_dep')
|
spdlog = spdlog_subproject.get_variable('spdlog_dep')
|
||||||
endif
|
|
||||||
|
|
||||||
aubio = dependency('aubio', version: '>=0.4.9', required: false)
|
aubio = dependency('aubio', version: '>=0.4.9', required: false)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user