projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
045d811
)
Rename ENABLE_GSTREAMERMM to ENABLE_FLOW.
author
Uwe Hermann
<uwe@hermann-uwe.de>
Thu, 10 Jan 2019 01:26:18 +0000
(
02:26
+0100)
committer
Uwe Hermann
<uwe@hermann-uwe.de>
Thu, 10 Jan 2019 01:26:18 +0000
(
02:26
+0100)
CMakeLists.txt
patch
|
blob
|
history
main.cpp
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 55b03e5b66ea97cf840833a66f3ebd33b929a3c0..47dc03b86a142b15bc20b5f11c80adc0637886d8 100644
(file)
--- 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_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)
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)
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()
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)
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)
endif()
if(ENABLE_DECODE)
diff --git
a/main.cpp
b/main.cpp
index a4c7e72badfd6fb4fca88e3cf559d47c5a4586da..d4428ae8bd1c5d7dd8fe71f345e4a50937994e60 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-26,7
+26,7
@@
#include <getopt.h>
#include <vector>
#include <getopt.h>
#include <vector>
-#ifdef ENABLE_
GSTREAMERMM
+#ifdef ENABLE_
FLOW
#include <gstreamermm.h>
#include <libsigrokflow/libsigrokflow.hpp>
#endif
#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;
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
// Initialise gstreamermm. Must be called before any other GLib stuff.
Gst::init();
#endif