diff options
| -rw-r--r-- | mesonbuild/dependencies/ui.py | 4 | ||||
| -rw-r--r-- | test cases/frameworks/9 wxwidgets/meson.build | 5 | ||||
| -rw-r--r-- | test cases/frameworks/9 wxwidgets/wxstc.cpp | 6 |
3 files changed, 13 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index a6307c4..3e2d170 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -432,8 +432,8 @@ class WxDependency(ConfigToolDependency): self.requested_modules = self.get_requested(kwargs) # wx-config seems to have a cflags as well but since it requires C++, # this should be good, at least for now. - self.compile_args = self.get_config_value(['--cxxflags'], 'compile_args') - self.link_args = self.get_config_value(['--libs'], 'link_args') + self.compile_args = self.get_config_value(['--cxxflags'] + self.requested_modules, 'compile_args') + self.link_args = self.get_config_value(['--libs'] + self.requested_modules, 'link_args') def get_requested(self, kwargs): if 'modules' not in kwargs: diff --git a/test cases/frameworks/9 wxwidgets/meson.build b/test cases/frameworks/9 wxwidgets/meson.build index 5f9419c..d815a2d 100644 --- a/test cases/frameworks/9 wxwidgets/meson.build +++ b/test cases/frameworks/9 wxwidgets/meson.build @@ -7,4 +7,9 @@ if wxd.found() wp = executable('wxprog', 'wxprog.cpp', dependencies : wxd) test('wxtest', wp) + + # WxWidgets framework is available, we can use required here + wx_stc = dependency('wxwidgets', version : '>=3.0.0', modules : ['std', 'stc']) + stc_exe = executable('wxstc', 'wxstc.cpp', dependencies : wx_stc) + test('wxstctest', stc_exe) endif diff --git a/test cases/frameworks/9 wxwidgets/wxstc.cpp b/test cases/frameworks/9 wxwidgets/wxstc.cpp new file mode 100644 index 0000000..8499ff9 --- /dev/null +++ b/test cases/frameworks/9 wxwidgets/wxstc.cpp @@ -0,0 +1,6 @@ +#include <wx/stc/stc.h> + +int main() { + wxStyledTextCtrl *canvas = new wxStyledTextCtrl(); + delete canvas; +} |