diff options
| author | Philippe Payant <philippe@inrosoftware.com> | 2017-06-21 15:18:38 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-06-27 11:56:21 -0400 |
| commit | e4daad369ac1f5518e114561ca1c7349a4b309ae (patch) | |
| tree | 788b159291d4e8ea15eee4a65b74d0e7cfc50cd8 | |
| parent | 85eddf4eb2b74a23dc62201ac56b1ab5363ef5dd (diff) | |
| download | meson-e4daad369ac1f5518e114561ca1c7349a4b309ae.zip meson-e4daad369ac1f5518e114561ca1c7349a4b309ae.tar.gz meson-e4daad369ac1f5518e114561ca1c7349a4b309ae.tar.bz2 | |
Select release or debug libraries for Qt, based on buildtype.
| -rw-r--r-- | mesonbuild/dependencies/ui.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index af515db..f1ee7a6 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -291,10 +291,12 @@ class QtBaseDependency(ExternalDependency): mincdir = os.path.join(incdir, 'Qt' + module) self.compile_args.append('-I' + mincdir) if for_windows(self.env.is_cross_build(), self.env): + is_debug = self.env.cmd_line_options.buildtype.startswith('debug') + dbg = 'd' if is_debug else '' if self.qtver == '4': - base_name = 'Qt' + module + '4' + base_name = 'Qt' + module + dbg + '4' else: - base_name = 'Qt5' + module + base_name = 'Qt5' + module + dbg libfile = os.path.join(libdir, base_name + '.lib') if not os.path.isfile(libfile): # MinGW can link directly to .dll |