Add a TODO for replacing the cmake subproject

This is not going to work due to the linked issue with Meson. I didn't
want to reinvent the wheel by writing a meson build file by hand, but
we'll just have to.
This commit is contained in:
Robbert van der Helm
2020-11-28 18:05:29 +01:00
parent 9ece1b916e
commit 4be7af2451
+18 -15
View File
@@ -2,7 +2,7 @@ project(
'yabridge', 'yabridge',
'cpp', 'cpp',
version : '2.1.0', version : '2.1.0',
default_options : ['warning_level=3', 'cpp_std=c++2a', 'build.cpp_std=c++2a'] default_options : ['warning_level=3', 'cpp_std=c++2a', 'build.cpp_std=c++2a'],
) )
# Meson does not let us set a default cross compiler, which makes sense, but it # Meson does not let us set a default cross compiler, which makes sense, but it
@@ -60,7 +60,7 @@ boost_filesystem_dep = dependency(
'boost', 'boost',
version : '>=1.66', version : '>=1.66',
modules : ['filesystem'], modules : ['filesystem'],
static : with_static_boost static : with_static_boost,
) )
bitsery_dep = subproject('bitsery', version : '5.2.0').get_variable('bitsery_dep') bitsery_dep = subproject('bitsery', version : '5.2.0').get_variable('bitsery_dep')
function2_dep = subproject('function2', version : '4.1.0').get_variable('function2_dep') function2_dep = subproject('function2', version : '4.1.0').get_variable('function2_dep')
@@ -70,6 +70,8 @@ tomlplusplus_dep = subproject('tomlplusplus', version : '2.1.0').get_variable('t
wine_threads_dep = declare_dependency(link_args : '-lpthread') wine_threads_dep = declare_dependency(link_args : '-lpthread')
xcb_dep = dependency('xcb') xcb_dep = dependency('xcb')
if with_vst3 if with_vst3
# TODO: Assert version '3.7.1', somehow
cmake = import('cmake') cmake = import('cmake')
vst3_sdk_options = cmake.subproject_options() vst3_sdk_options = cmake.subproject_options()
vst3_sdk_options.add_cmake_defines({ vst3_sdk_options.add_cmake_defines({
@@ -78,10 +80,11 @@ if with_vst3
'SMTG_ADD_VSTGUI': 'OFF', 'SMTG_ADD_VSTGUI': 'OFF',
}) })
vst3_sdk = cmake.subproject('vst3', options : vst3_sdk_options) vst3_sdk = cmake.subproject('vst3', options : vst3_sdk_options)
# TODO: This is not going to work due to
# TODO: Assert version '3.7.1', somehow # https://github.com/mesonbuild/meson/issues/8043
# TODO: Check C++ standard? # We'll have to replace this with a Meson subproject for the time being
# TODO: vst3_xxx_dep = vst3_sdk.dependency('xxx') # and remove all references to cmake
# vst3_pluginterfaces_dep = vst3_sdk.dependency('pluginterfaces', native : true)
else else
message('VST3 support has been disabled') message('VST3 support has been disabled')
endif endif
@@ -114,7 +117,7 @@ shared_library(
boost_filesystem_dep, boost_filesystem_dep,
bitsery_dep, bitsery_dep,
threads_dep, threads_dep,
tomlplusplus_dep tomlplusplus_dep,
], ],
cpp_args : compiler_options, cpp_args : compiler_options,
link_args : ['-ldl'] link_args : ['-ldl']
@@ -151,10 +154,10 @@ executable(
function2_dep, function2_dep,
tomlplusplus_dep, tomlplusplus_dep,
wine_threads_dep, wine_threads_dep,
xcb_dep xcb_dep,
], ],
cpp_args : compiler_options + ['-m64'], cpp_args : compiler_options + ['-m64'],
link_args : ['-m64'] link_args : ['-m64'],
) )
executable( executable(
@@ -169,10 +172,10 @@ executable(
function2_dep, function2_dep,
tomlplusplus_dep, tomlplusplus_dep,
wine_threads_dep, wine_threads_dep,
xcb_dep xcb_dep,
], ],
cpp_args : compiler_options + ['-m64'], cpp_args : compiler_options + ['-m64'],
link_args : ['-m64'] link_args : ['-m64'],
) )
if with_bitbridge if with_bitbridge
@@ -215,10 +218,10 @@ if with_bitbridge
function2_dep, function2_dep,
tomlplusplus_dep, tomlplusplus_dep,
wine_threads_dep, wine_threads_dep,
xcb_dep xcb_dep,
], ],
cpp_args : compiler_options + ['-m32'], cpp_args : compiler_options + ['-m32'],
link_args : ['-m32'] link_args : ['-m32'],
) )
executable( executable(
@@ -233,9 +236,9 @@ if with_bitbridge
function2_dep, function2_dep,
tomlplusplus_dep, tomlplusplus_dep,
wine_threads_dep, wine_threads_dep,
xcb_dep xcb_dep,
], ],
cpp_args : compiler_options + ['-m32'], cpp_args : compiler_options + ['-m32'],
link_args : ['-m32'] link_args : ['-m32'],
) )
endif endif