projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow: Add shortcuts for the open/save menu items.
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 2ba907af96be14167535429551873a751d639c04..50dde49032ca2ff898757f847abc465f3bc575cf 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-33,7
+33,7
@@
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_DECODE "Build with libsigrokdecode"
FALS
E)
+option(ENABLE_DECODE "Build with libsigrokdecode"
TRU
E)
option(ENABLE_COTIRE "Enable cotire" FALSE)
option(ENABLE_TESTS "Enable unit tests" FALSE)
option(STATIC_PKGDEPS_LIBS "Statically link to (pkg-config) libraries" FALSE)
option(ENABLE_COTIRE "Enable cotire" FALSE)
option(ENABLE_TESTS "Enable unit tests" FALSE)
option(STATIC_PKGDEPS_LIBS "Statically link to (pkg-config) libraries" FALSE)
@@
-51,14
+51,20
@@
if(WIN32)
set(ENABLE_SIGNALS FALSE)
endif()
set(ENABLE_SIGNALS FALSE)
endif()
+if(NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
+ "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
+ FORCE)
+endif()
+
#===============================================================================
#= Dependencies
#-------------------------------------------------------------------------------
#===============================================================================
#= Dependencies
#-------------------------------------------------------------------------------
-list(APPEND PKGDEPS libsigrok>=0.
2
.0)
+list(APPEND PKGDEPS libsigrok>=0.
3
.0)
if(ENABLE_DECODE)
if(ENABLE_DECODE)
- list(APPEND PKGDEPS libsigrokdecode>=0.
2
.0)
+ list(APPEND PKGDEPS libsigrokdecode>=0.
3
.0)
endif()
find_package(PkgConfig)
endif()
find_package(PkgConfig)
@@
-74,11
+80,18
@@
find_package(Threads)
if(WIN32)
# On Windows/MinGW we need to use 'thread_win32' instead of 'thread'.
# The library is named libboost_thread_win32* (not libboost_thread*).
if(WIN32)
# On Windows/MinGW we need to use 'thread_win32' instead of 'thread'.
# The library is named libboost_thread_win32* (not libboost_thread*).
- find_package(Boost 1.42 COMPONENTS system thread_win32 REQUIRED)
+ find_package(Boost 1.42 COMPONENTS
filesystem
system thread_win32 REQUIRED)
else()
else()
- find_package(Boost 1.42 COMPONENTS system thread REQUIRED)
+ find_package(Boost 1.42 COMPONENTS
filesystem
system thread REQUIRED)
endif()
endif()
+#===============================================================================
+#= System Introspection
+#-------------------------------------------------------------------------------
+
+include(memaccess)
+memaccess_check_unaligned_le(HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS)
+
#===============================================================================
#= Config Header
#-------------------------------------------------------------------------------
#===============================================================================
#= Config Header
#-------------------------------------------------------------------------------
@@
-87,7
+100,7
@@
set(PV_TITLE PulseView)
set(PV_DESCRIPTION "A GUI for sigrok")
set(PV_VERSION_MAJOR 0)
set(PV_DESCRIPTION "A GUI for sigrok")
set(PV_VERSION_MAJOR 0)
-set(PV_VERSION_MINOR
1
)
+set(PV_VERSION_MINOR
2
)
set(PV_VERSION_MICRO 0)
set(PV_VERSION_STRING
${PV_VERSION_MAJOR}.${PV_VERSION_MINOR}.${PV_VERSION_MICRO}
set(PV_VERSION_MICRO 0)
set(PV_VERSION_STRING
${PV_VERSION_MAJOR}.${PV_VERSION_MINOR}.${PV_VERSION_MICRO}
@@
-114,6
+127,11
@@
set(pulseview_SOURCES
pv/data/logicsnapshot.cpp
pv/data/signaldata.cpp
pv/data/snapshot.cpp
pv/data/logicsnapshot.cpp
pv/data/signaldata.cpp
pv/data/snapshot.cpp
+ pv/device/device.cpp
+ pv/device/file.cpp
+ pv/device/devinst.cpp
+ pv/device/inputfile.cpp
+ pv/device/sessionfile.cpp
pv/dialogs/about.cpp
pv/dialogs/connect.cpp
pv/dialogs/storeprogress.cpp
pv/dialogs/about.cpp
pv/dialogs/connect.cpp
pv/dialogs/storeprogress.cpp
@@
-155,6
+173,7
@@
set(pulseview_HEADERS
pv/mainwindow.h
pv/sigsession.h
pv/storesession.h
pv/mainwindow.h
pv/sigsession.h
pv/storesession.h
+ pv/device/devinst.h
pv/dialogs/about.h
pv/dialogs/connect.h
pv/dialogs/storeprogress.h
pv/dialogs/about.h
pv/dialogs/connect.h
pv/dialogs/storeprogress.h
@@
-204,6
+223,8
@@
if(ENABLE_DECODE)
pv/data/decoderstack.cpp
pv/data/decode/annotation.cpp
pv/data/decode/decoder.cpp
pv/data/decoderstack.cpp
pv/data/decode/annotation.cpp
pv/data/decode/decoder.cpp
+ pv/data/decode/row.cpp
+ pv/data/decode/rowdata.cpp
pv/prop/binding/decoderoptions.cpp
pv/view/decodetrace.cpp
pv/widgets/decodergroupbox.cpp
pv/prop/binding/decoderoptions.cpp
pv/view/decodetrace.cpp
pv/widgets/decodergroupbox.cpp
@@
-278,6
+299,10
@@
set(PULSEVIEW_LINK_LIBS
if(STATIC_PKGDEPS_LIBS)
link_directories(${PKGDEPS_STATIC_LIBRARY_DIRS})
list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_STATIC_LIBRARIES})
if(STATIC_PKGDEPS_LIBS)
link_directories(${PKGDEPS_STATIC_LIBRARY_DIRS})
list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_STATIC_LIBRARIES})
+if(WIN32)
+ # Workaround for a MinGW linking issue.
+ list(APPEND PULSEVIEW_LINK_LIBS "-llzma -llcms2")
+endif()
else()
link_directories(${PKGDEPS_LIBRARY_DIRS})
list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_LIBRARIES})
else()
link_directories(${PKGDEPS_LIBRARY_DIRS})
list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_LIBRARIES})