projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DecoderSelector: Properly name utility methods
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 3482980958f6ffbf557f95526d7b9f1a9fca0361..b6c88f4f640c37ffea1b972b0c39f956ab8c4156 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-29,17
+29,23
@@
if(POLICY CMP0071)
cmake_policy(SET CMP0071 NEW)
endif()
cmake_policy(SET CMP0071 NEW)
endif()
+# Only interpret if() arguments as variables or keywords when unquoted.
+if(POLICY CMP0054)
+ cmake_policy(SET CMP0054 NEW)
+endif()
+
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
#===============================================================================
#= User Options
#-------------------------------------------------------------------------------
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
#===============================================================================
#= 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" FALSE)
+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)
@@
-57,6
+63,12
@@
if(NOT CMAKE_BUILD_TYPE)
FORCE)
endif()
FORCE)
endif()
+#===============================================================================
+#= Documentation
+#-------------------------------------------------------------------------------
+
+add_subdirectory(manual)
+
#===============================================================================
#= Dependencies
#-------------------------------------------------------------------------------
#===============================================================================
#= Dependencies
#-------------------------------------------------------------------------------
@@
-64,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)
@@
-75,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)
@@
-181,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]*)?$")
@@
-190,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
@@
-238,6
+266,7
@@
set(pulseview_SOURCES
pv/prop/int.cpp
pv/prop/property.cpp
pv/prop/string.cpp
pv/prop/int.cpp
pv/prop/property.cpp
pv/prop/string.cpp
+ pv/subwindows/subwindowbase.cpp
pv/toolbars/mainbar.cpp
pv/views/trace/analogsignal.cpp
pv/views/trace/cursor.cpp
pv/toolbars/mainbar.cpp
pv/views/trace/analogsignal.cpp
pv/views/trace/cursor.cpp
@@
-265,8
+294,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
@@
-302,6
+331,7
@@
set(pulseview_HEADERS
pv/prop/int.hpp
pv/prop/property.hpp
pv/prop/string.hpp
pv/prop/int.hpp
pv/prop/property.hpp
pv/prop/string.hpp
+ pv/subwindows/subwindowbase.hpp
pv/toolbars/mainbar.hpp
pv/views/trace/analogsignal.hpp
pv/views/trace/cursor.hpp
pv/toolbars/mainbar.hpp
pv/views/trace/analogsignal.hpp
pv/views/trace/cursor.hpp
@@
-324,8
+354,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
@@
-353,6
+383,9
@@
if(ENABLE_DECODE)
pv/data/decode/decoder.cpp
pv/data/decode/row.cpp
pv/data/decode/rowdata.cpp
pv/data/decode/decoder.cpp
pv/data/decode/row.cpp
pv/data/decode/rowdata.cpp
+ pv/subwindows/decoder_selector/item.cpp
+ pv/subwindows/decoder_selector/model.cpp
+ pv/subwindows/decoder_selector/subwindow.cpp
pv/views/trace/decodetrace.cpp
pv/widgets/decodergroupbox.cpp
pv/widgets/decodermenu.cpp
pv/views/trace/decodetrace.cpp
pv/widgets/decodergroupbox.cpp
pv/widgets/decodermenu.cpp
@@
-360,6
+393,7
@@
if(ENABLE_DECODE)
list(APPEND pulseview_HEADERS
pv/data/decodesignal.hpp
list(APPEND pulseview_HEADERS
pv/data/decodesignal.hpp
+ pv/subwindows/decoder_selector/subwindow.hpp
pv/views/trace/decodetrace.hpp
pv/widgets/decodergroupbox.hpp
pv/widgets/decodermenu.hpp
pv/views/trace/decodetrace.hpp
pv/widgets/decodergroupbox.hpp
pv/widgets/decodermenu.hpp
@@
-392,6
+426,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()
@@
-502,7
+540,7
@@
install(FILES icons/pulseview.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons
install(FILES icons/pulseview.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps)
# Generate Windows installer script.
install(FILES icons/pulseview.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps)
# Generate Windows installer script.
-configure_file(contrib/pulseview_cross.nsi.in contrib/pulseview_cross.nsi @ONLY)
+configure_file(contrib/pulseview_cross.nsi.in
${CMAKE_CURRENT_BINARY_DIR}/
contrib/pulseview_cross.nsi @ONLY)
#===============================================================================
#= Packaging (handled by CPack)
#===============================================================================
#= Packaging (handled by CPack)