projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename ENABLE_GSTREAMERMM to ENABLE_FLOW.
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 1e81a60ce37ee24dfc7d985ca8e7728a48f96fa7..47dc03b86a142b15bc20b5f11c80adc0637886d8 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-40,11
+40,12
@@
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
#= User Options
#-------------------------------------------------------------------------------
#= User Options
#-------------------------------------------------------------------------------
-option(DISABLE_WERROR "Build without -Werror"
FALS
E)
+option(DISABLE_WERROR "Build without -Werror"
TRU
E)
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_TESTS "Enable unit tests" 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)
if(WIN32)
option(STATIC_PKGDEPS_LIBS "Statically link to (pkg-config) libraries" FALSE)
if(WIN32)
@@
-62,6
+63,12
@@
if(NOT CMAKE_BUILD_TYPE)
FORCE)
endif()
FORCE)
endif()
+#===============================================================================
+#= Documentation
+#-------------------------------------------------------------------------------
+
+add_subdirectory(manual)
+
#===============================================================================
#= Dependencies
#-------------------------------------------------------------------------------
#===============================================================================
#= Dependencies
#-------------------------------------------------------------------------------
@@
-69,10
+76,16
@@
endif()
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)
-list(APPEND PKGDEPS libsigrokcxx>=0.6.0)
+if(ENABLE_FLOW)
+ list(APPEND PKGDEPS gstreamermm-1.0>=1.8.0)
+ list(APPEND PKGDEPS libsigrokflow>=0.1.0)
+endif()
+
+set(LIBSR_CXX_BINDING "libsigrokcxx>=0.5.1")
+list(APPEND PKGDEPS "${LIBSR_CXX_BINDING}")
if(ENABLE_DECODE)
if(ENABLE_DECODE)
- list(APPEND PKGDEPS libsigrokdecode>=0.
6.0
)
+ list(APPEND PKGDEPS libsigrokdecode>=0.
5.2
)
endif()
if(ANDROID)
endif()
if(ANDROID)
@@
-80,6
+93,10
@@
if(ANDROID)
endif()
find_package(PkgConfig)
endif()
find_package(PkgConfig)
+pkg_check_modules(LIBSRCXX ${LIBSR_CXX_BINDING})
+if(NOT LIBSRCXX_FOUND OR NOT LIBSRCXX_VERSION)
+ message(FATAL_ERROR "libsigrok C++ bindings missing, check libsigrok's 'configure' output (missing dependencies?)")
+endif()
pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
set(CMAKE_AUTOMOC TRUE)
pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
set(CMAKE_AUTOMOC TRUE)
@@
-186,6
+203,12
@@
if(NOT PV_TAG_VERSION_STRING)
string(SUBSTRING "${PV_HASH}" 0 7 PV_SHORTHASH)
set(PV_VERSION_STRING "${PV_VERSION_STRING}-git-${PV_SHORTHASH}")
endif()
string(SUBSTRING "${PV_HASH}" 0 7 PV_SHORTHASH)
set(PV_VERSION_STRING "${PV_VERSION_STRING}-git-${PV_SHORTHASH}")
endif()
+
+ # Non-tagged releases use the unstable manual
+ set(PV_MANUAL_VERSION "unstable")
+else()
+ # Tagged releases use a fixed manual version
+ set(PV_MANUAL_VERSION ${PV_VERSION_STRING})
endif()
if(PV_VERSION_STRING MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)(-[-0-9a-z]*)?$")
endif()
if(PV_VERSION_STRING MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)(-[-0-9a-z]*)?$")
@@
-195,7
+218,7
@@
if(PV_VERSION_STRING MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)(-[-0-9a-z]*)?$")
set(PV_VERSION_SUFFIX ${CMAKE_MATCH_4})
endif()
set(PV_VERSION_SUFFIX ${CMAKE_MATCH_4})
endif()
-message(
"--
${PV_TITLE} version: ${PV_VERSION_STRING}")
+message(
STATUS "
${PV_TITLE} version: ${PV_VERSION_STRING}")
configure_file (
${PROJECT_SOURCE_DIR}/config.h.in
configure_file (
${PROJECT_SOURCE_DIR}/config.h.in
@@
-270,8
+293,8
@@
set(pulseview_SOURCES
pv/views/trace/viewwidget.cpp
pv/views/viewbase.cpp
pv/views/trace/standardbar.cpp
pv/views/trace/viewwidget.cpp
pv/views/viewbase.cpp
pv/views/trace/standardbar.cpp
- pv/widgets/colo
u
rbutton.cpp
- pv/widgets/colo
u
rpopup.cpp
+ pv/widgets/colorbutton.cpp
+ pv/widgets/colorpopup.cpp
pv/widgets/devicetoolbutton.cpp
pv/widgets/exportmenu.cpp
pv/widgets/importmenu.cpp
pv/widgets/devicetoolbutton.cpp
pv/widgets/exportmenu.cpp
pv/widgets/importmenu.cpp
@@
-329,8
+352,8
@@
set(pulseview_HEADERS
pv/views/trace/viewwidget.hpp
pv/views/viewbase.hpp
pv/views/trace/standardbar.hpp
pv/views/trace/viewwidget.hpp
pv/views/viewbase.hpp
pv/views/trace/standardbar.hpp
- pv/widgets/colo
u
rbutton.hpp
- pv/widgets/colo
u
rpopup.hpp
+ pv/widgets/colorbutton.hpp
+ pv/widgets/colorpopup.hpp
pv/widgets/devicetoolbutton.hpp
pv/widgets/exportmenu.hpp
pv/widgets/importmenu.hpp
pv/widgets/devicetoolbutton.hpp
pv/widgets/exportmenu.hpp
pv/widgets/importmenu.hpp
@@
-397,6
+420,10
@@
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_FLOW)
+ add_definitions(-DENABLE_FLOW)
+endif()
+
if(ENABLE_DECODE)
add_definitions(-DENABLE_DECODE)
endif()
if(ENABLE_DECODE)
add_definitions(-DENABLE_DECODE)
endif()