projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add bindings for new device options
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 3859c9133b61e01ffb93599f684fd550470e6a48..d98ff54c87023717e0ba5660b85b637070b8138a 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-23,7
+23,7
@@
cmake_minimum_required(VERSION 2.8.6)
include(FindPkgConfig)
include(GNUInstallDirs)
include(FindPkgConfig)
include(GNUInstallDirs)
-set
(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
project(pulseview)
project(pulseview)
@@
-36,7
+36,7
@@
option(ENABLE_SIGNALS "Build with UNIX signals" TRUE)
option(ENABLE_DECODE "Build with libsigrokdecode" FALSE)
option(ENABLE_COTIRE "Enable cotire" FALSE)
option(ENABLE_TESTS "Enable unit tests" FALSE)
option(ENABLE_DECODE "Build with libsigrokdecode" FALSE)
option(ENABLE_COTIRE "Enable cotire" FALSE)
option(ENABLE_TESTS "Enable unit tests" FALSE)
-option(STATIC_PKGDEPS_LIBS "Statically link to (pkgconfig) libraries" FALSE)
+option(STATIC_PKGDEPS_LIBS "Statically link to (pkg
-
config) libraries" FALSE)
if(WIN32)
# On Windows/MinGW we need to statically link to libraries.
if(WIN32)
# On Windows/MinGW we need to statically link to libraries.
@@
-44,13
+44,19
@@
if(WIN32)
set(STATIC_PKGDEPS_LIBS TRUE)
# For boost-thread we need two additional settings on win32:
set(STATIC_PKGDEPS_LIBS TRUE)
# For boost-thread we need two additional settings on win32:
- set(Boost_USE_STATIC_LIBS
on
)
+ set(Boost_USE_STATIC_LIBS
ON
)
add_definitions(-DBOOST_THREAD_USE_LIB)
# Windows does not support UNIX signals.
set(ENABLE_SIGNALS FALSE)
endif()
add_definitions(-DBOOST_THREAD_USE_LIB)
# Windows does not support UNIX signals.
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
#-------------------------------------------------------------------------------
@@
-64,7
+70,7
@@
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_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).
@@
-72,11
+78,11
@@
find_package(Qt4 REQUIRED)
find_package(Threads)
if(WIN32)
find_package(Threads)
if(WIN32)
-
# On Windows/MinGW the
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)
+
# 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)
else()
else()
-find_package(Boost 1.42 COMPONENTS system thread REQUIRED)
+
find_package(Boost 1.42 COMPONENTS system thread REQUIRED)
endif()
#===============================================================================
endif()
#===============================================================================
@@
-107,6
+113,7
@@
set(pulseview_SOURCES
pv/devicemanager.cpp
pv/mainwindow.cpp
pv/sigsession.cpp
pv/devicemanager.cpp
pv/mainwindow.cpp
pv/sigsession.cpp
+ pv/storesession.cpp
pv/data/analog.cpp
pv/data/analogsnapshot.cpp
pv/data/logic.cpp
pv/data/analog.cpp
pv/data/analogsnapshot.cpp
pv/data/logic.cpp
@@
-115,6
+122,7
@@
set(pulseview_SOURCES
pv/data/snapshot.cpp
pv/dialogs/about.cpp
pv/dialogs/connect.cpp
pv/data/snapshot.cpp
pv/dialogs/about.cpp
pv/dialogs/connect.cpp
+ pv/dialogs/storeprogress.cpp
pv/popups/deviceoptions.cpp
pv/popups/probes.cpp
pv/prop/bool.cpp
pv/popups/deviceoptions.cpp
pv/popups/probes.cpp
pv/prop/bool.cpp
@@
-144,6
+152,7
@@
set(pulseview_SOURCES
pv/widgets/colourpopup.cpp
pv/widgets/popup.cpp
pv/widgets/popuptoolbutton.cpp
pv/widgets/colourpopup.cpp
pv/widgets/popup.cpp
pv/widgets/popuptoolbutton.cpp
+ pv/widgets/sweeptimingwidget.cpp
pv/widgets/wellarray.cpp
)
pv/widgets/wellarray.cpp
)
@@
-151,8
+160,10
@@
set(pulseview_SOURCES
set(pulseview_HEADERS
pv/mainwindow.h
pv/sigsession.h
set(pulseview_HEADERS
pv/mainwindow.h
pv/sigsession.h
+ pv/storesession.h
pv/dialogs/about.h
pv/dialogs/connect.h
pv/dialogs/about.h
pv/dialogs/connect.h
+ pv/dialogs/storeprogress.h
pv/popups/probes.h
pv/popups/deviceoptions.h
pv/prop/bool.h
pv/popups/probes.h
pv/popups/deviceoptions.h
pv/prop/bool.h
@@
-177,6
+188,7
@@
set(pulseview_HEADERS
pv/widgets/colourpopup.h
pv/widgets/popup.h
pv/widgets/popuptoolbutton.h
pv/widgets/colourpopup.h
pv/widgets/popup.h
pv/widgets/popuptoolbutton.h
+ pv/widgets/sweeptimingwidget.h
pv/widgets/wellarray.h
)
pv/widgets/wellarray.h
)
@@
-198,11
+210,12
@@
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/widgets/decodermenu.cpp
pv/prop/binding/decoderoptions.cpp
pv/view/decodetrace.cpp
pv/widgets/decodergroupbox.cpp
pv/widgets/decodermenu.cpp
- pv/widgets/wellarray.cpp
)
list(APPEND pulseview_HEADERS
)
list(APPEND pulseview_HEADERS
@@
-217,7
+230,7
@@
if(WIN32)
# Use the sigrok icon for the pulseview.exe executable.
set(CMAKE_RC_COMPILE_OBJECT "${CMAKE_RC_COMPILER} -O coff -I${CMAKE_CURRENT_SOURCE_DIR} <SOURCE> <OBJECT>")
enable_language(RC)
# Use the sigrok icon for the pulseview.exe executable.
set(CMAKE_RC_COMPILE_OBJECT "${CMAKE_RC_COMPILER} -O coff -I${CMAKE_CURRENT_SOURCE_DIR} <SOURCE> <OBJECT>")
enable_language(RC)
- list(APPEND pulseview_SOURCES pulseviewico.rc)
+ list(APPEND pulseview_SOURCES pulseviewico.rc)
endif()
qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
endif()
qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
@@
-273,6
+286,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})
@@
-297,8
+314,8
@@
add_executable(${PROJECT_NAME}
target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})
if(WIN32)
target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})
if(WIN32)
-
# Pass -mwindows so that no "DOS box" will open
when PulseView is started.
-set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-mwindows")
+
# Pass -mwindows so that no "DOS box" opens
when PulseView is started.
+
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-mwindows")
endif()
if(ENABLE_COTIRE)
endif()
if(ENABLE_COTIRE)