From: Uwe Hermann <redacted>
Date: Thu, 10 Jan 2019 01:26:18 +0000 (+0100)
Subject: Rename ENABLE_GSTREAMERMM to ENABLE_FLOW.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=696c7eac4d10f630d9d120af9a1106eecf4fd75e;p=pulseview.git

Rename ENABLE_GSTREAMERMM to ENABLE_FLOW.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55b03e5b..47dc03b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,7 @@ option(DISABLE_WERROR "Build without -Werror" TRUE)
 option(ENABLE_SIGNALS "Build with UNIX signals" TRUE)
 option(ENABLE_STACKTRACE "Enable stack trace when crashing" FALSE)
 option(ENABLE_DECODE "Build with libsigrokdecode" TRUE)
-option(ENABLE_GSTREAMERMM "Build with gstreamermm" TRUE)
+option(ENABLE_FLOW "Build with libsigrokflow" TRUE)
 option(ENABLE_TESTS "Enable unit tests" FALSE)
 option(STATIC_PKGDEPS_LIBS "Statically link to (pkg-config) libraries" FALSE)
 
@@ -76,7 +76,7 @@ add_subdirectory(manual)
 list(APPEND PKGDEPS glib-2.0>=2.28.0)
 list(APPEND PKGDEPS glibmm-2.4>=2.28.0)
 
-if(ENABLE_GSTREAMERMM)
+if(ENABLE_FLOW)
 	list(APPEND PKGDEPS gstreamermm-1.0>=1.8.0)
 	list(APPEND PKGDEPS libsigrokflow>=0.1.0)
 endif()
@@ -420,8 +420,8 @@ add_definitions(-Wall -Wextra)
 add_definitions(-std=c++11)
 add_definitions(-DBOOST_MATH_DISABLE_FLOAT128=1)
 
-if(ENABLE_GSTREAMERMM)
-	add_definitions(-DENABLE_GSTREAMERMM)
+if(ENABLE_FLOW)
+	add_definitions(-DENABLE_FLOW)
 endif()
 
 if(ENABLE_DECODE)
diff --git a/main.cpp b/main.cpp
index a4c7e72b..d4428ae8 100644
--- a/main.cpp
+++ b/main.cpp
@@ -26,7 +26,7 @@
 #include <getopt.h>
 #include <vector>
 
-#ifdef ENABLE_GSTREAMERMM
+#ifdef ENABLE_FLOW
 #include <gstreamermm.h>
 #include <libsigrokflow/libsigrokflow.hpp>
 #endif
@@ -174,7 +174,7 @@ int main(int argc, char *argv[])
 	bool do_scan = true;
 	bool show_version = false;
 
-#ifdef ENABLE_GSTREAMERMM
+#ifdef ENABLE_FLOW
 	// Initialise gstreamermm. Must be called before any other GLib stuff.
 	Gst::init();
 #endif