projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added skeleton pv::view::decode::Annotation class
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 01c3660d9cf86fecd87ea11eeea4fee228787ded..5d268e71340db4334d66387247bd838ffcede020 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-18,7
+18,7
@@
## along with this program. If not, see <http://www.gnu.org/licenses/>.
##
## along with this program. If not, see <http://www.gnu.org/licenses/>.
##
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.
8.
6)
include(FindPkgConfig)
include(GNUInstallDirs)
include(FindPkgConfig)
include(GNUInstallDirs)
@@
-34,7
+34,6
@@
project(pulseview)
option(DISABLE_WERROR "Build without -Werror" FALSE)
option(ENABLE_SIGNALS "Build with UNIX signals" TRUE)
option(DISABLE_WERROR "Build without -Werror" FALSE)
option(ENABLE_SIGNALS "Build with UNIX signals" TRUE)
-option(ENABLE_SIGROKDECODE "Build with libsigrokdecode" FALSE)
option(ENABLE_TESTS "Enable unit tests" FALSE)
option(STATIC_PKGDEPS_LIBS "Statically link to (pkgconfig) libraries" FALSE)
option(ENABLE_TESTS "Enable unit tests" FALSE)
option(STATIC_PKGDEPS_LIBS "Statically link to (pkgconfig) libraries" FALSE)
@@
-57,12
+56,9
@@
endif()
list(APPEND PKGDEPS
libsigrok>=0.2.0
list(APPEND PKGDEPS
libsigrok>=0.2.0
+ libsigrokdecode>=0.2.0
)
)
-if(ENABLE_SIGROKDECODE)
- list(APPEND PKGDEPS libsigrokdecode>=0.2.0)
-endif()
-
find_package(PkgConfig)
pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
find_package(PkgConfig)
pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
@@
-111,12
+107,14
@@
set(pulseview_SOURCES
pv/sigsession.cpp
pv/data/analog.cpp
pv/data/analogsnapshot.cpp
pv/sigsession.cpp
pv/data/analog.cpp
pv/data/analogsnapshot.cpp
+ pv/data/decoder.cpp
pv/data/logic.cpp
pv/data/logicsnapshot.cpp
pv/data/signaldata.cpp
pv/data/snapshot.cpp
pv/dialogs/about.cpp
pv/dialogs/connect.cpp
pv/data/logic.cpp
pv/data/logicsnapshot.cpp
pv/data/signaldata.cpp
pv/data/snapshot.cpp
pv/dialogs/about.cpp
pv/dialogs/connect.cpp
+ pv/dialogs/decoder.cpp
pv/dialogs/deviceoptions.cpp
pv/prop/bool.cpp
pv/prop/double.cpp
pv/dialogs/deviceoptions.cpp
pv/prop/bool.cpp
pv/prop/double.cpp
@@
-130,6
+128,7
@@
set(pulseview_SOURCES
pv/view/analogsignal.cpp
pv/view/cursor.cpp
pv/view/cursorpair.cpp
pv/view/analogsignal.cpp
pv/view/cursor.cpp
pv/view/cursorpair.cpp
+ pv/view/decodesignal.cpp
pv/view/header.cpp
pv/view/marginwidget.cpp
pv/view/logicsignal.cpp
pv/view/header.cpp
pv/view/marginwidget.cpp
pv/view/logicsignal.cpp
@@
-140,6
+139,7
@@
set(pulseview_SOURCES
pv/view/trace.cpp
pv/view/view.cpp
pv/view/viewport.cpp
pv/view/trace.cpp
pv/view/view.cpp
pv/view/viewport.cpp
+ pv/view/decode/annotation.cpp
)
# This list includes only QObject derrived class headers
)
# This list includes only QObject derrived class headers
@@
-190,10
+190,6
@@
include(${QT_USE_FILE})
add_definitions(${QT_DEFINITIONS})
add_definitions(-Wall -Wextra)
add_definitions(${QT_DEFINITIONS})
add_definitions(-Wall -Wextra)
-if(ENABLE_SIGROKDECODE)
- add_definitions(-DENABLE_SIGROKDECODE)
-endif()
-
if(NOT DISABLE_WERROR)
add_definitions(-Werror)
endif()
if(NOT DISABLE_WERROR)
add_definitions(-Werror)
endif()