From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Tue, 18 Dec 2018 22:53:49 +0000 (+0100)
Subject: Fix a variable conflict in the Meson build files.
X-Git-Tag: 1.8.0~6
X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=d12283c92f0750871834b7c5afda605402d3b832

Fix a variable conflict in the Meson build files.
---

diff --git a/shared/meson.build b/shared/meson.build
index 49c52ee..9f07842 100644
--- a/shared/meson.build
+++ b/shared/meson.build
@@ -1,12 +1,12 @@
 qt5 = import('qt5')
-qt5deps = dependency('qt5', modules: ['Core', 'Gui', 'Widgets', 'OpenGL'])
+shared_qt5deps = dependency('qt5', modules: ['Core', 'Gui', 'Widgets', 'OpenGL'])
 libmicrohttpddep = dependency('libmicrohttpd')
 
 # Preprocess Qt as needed.
 qt_files = qt5.preprocess(
 	moc_headers: ['aboutdialog.h'],
 	ui_files: ['aboutdialog.ui'],
-	dependencies: qt5deps)
+	dependencies: shared_qt5deps)
 
 srcs = ['memcpy_interleaved.cpp', 'metacube2.cpp', 'ffmpeg_raii.cpp', 'mux.cpp', 'metrics.cpp', 'context.cpp', 'httpd.cpp', 'disk_space_estimator.cpp', 'read_file.cpp']
 
@@ -14,7 +14,7 @@ srcs = ['memcpy_interleaved.cpp', 'metacube2.cpp', 'ffmpeg_raii.cpp', 'mux.cpp',
 srcs += qt_files
 srcs += ['aboutdialog.cpp']
 
-shared = static_library('shared', srcs, include_directories: top_include, dependencies: [qt5deps, libmicrohttpddep])
+shared = static_library('shared', srcs, include_directories: top_include, dependencies: [shared_qt5deps, libmicrohttpddep])
 shareddep = declare_dependency(
    include_directories: top_include,
    link_with: shared)