projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added pv::data::Decoder container object
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index d835927ebb504a0696d07b5a0b84b5f49fa1015d..e66f12518d789830f0be707852a02239df6a77d9 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-18,10
+18,14
@@
## 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)
+set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
+include(cotire)
+
project(pulseview)
#===============================================================================
project(pulseview)
#===============================================================================
@@
-30,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)
@@
-53,15
+56,13
@@
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})
+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac)
find_package(Qt4 REQUIRED)
# Find the platform's thread library (needed for boost-thread).
find_package(Qt4 REQUIRED)
# Find the platform's thread library (needed for boost-thread).
@@
-106,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
@@
-125,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
@@
-132,10
+136,12
@@
set(pulseview_SOURCES
pv/view/selectableitem.cpp
pv/view/signal.cpp
pv/view/timemarker.cpp
pv/view/selectableitem.cpp
pv/view/signal.cpp
pv/view/timemarker.cpp
+ pv/view/trace.cpp
pv/view/view.cpp
pv/view/viewport.cpp
)
pv/view/view.cpp
pv/view/viewport.cpp
)
+# This list includes only QObject derrived class headers
set(pulseview_HEADERS
pv/mainwindow.h
pv/sigsession.h
set(pulseview_HEADERS
pv/mainwindow.h
pv/sigsession.h
@@
-146,11
+152,13
@@
set(pulseview_HEADERS
pv/toolbars/samplingbar.h
pv/view/cursor.h
pv/view/header.h
pv/toolbars/samplingbar.h
pv/view/cursor.h
pv/view/header.h
+ pv/view/logicsignal.h
pv/view/marginwidget.h
pv/view/ruler.h
pv/view/selectableitem.h
pv/view/signal.h
pv/view/timemarker.h
pv/view/marginwidget.h
pv/view/ruler.h
pv/view/selectableitem.h
pv/view/signal.h
pv/view/timemarker.h
+ pv/view/trace.h
pv/view/view.h
pv/view/viewport.h
)
pv/view/view.h
pv/view/viewport.h
)
@@
-181,10
+189,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()
@@
-233,6
+237,7
@@
add_executable(${PROJECT_NAME}
)
target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})
)
target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})
+cotire(${PROJECT_NAME})
if(WIN32)
# Pass -mwindows so that no "DOS box" will open when PulseView is started.
if(WIN32)
# Pass -mwindows so that no "DOS box" will open when PulseView is started.