aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorAleksey Filippov <alekseyf@google.com>2018-02-21 23:15:10 +0000
committerJussi Pakkanen <jpakkane@gmail.com>2018-02-22 20:27:19 +0200
commit56c6489a6cc5879186999dbdab0e54c51210c2f2 (patch)
treef4f8ae9af3a2826e43175f5064a676fecffd2167 /mesonbuild
parent6b550ae91f166a5c5161ab23c500760a9a155909 (diff)
downloadmeson-56c6489a6cc5879186999dbdab0e54c51210c2f2.zip
meson-56c6489a6cc5879186999dbdab0e54c51210c2f2.tar.gz
meson-56c6489a6cc5879186999dbdab0e54c51210c2f2.tar.bz2
Fix wxwidgets dependency: pass modules to wx-config
Fixes #3123
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/dependencies/ui.py4
1 files changed, 2 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: