projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added Bool property and bound to SR_CONF_RLE
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index c9173047561efcb59efb93ae15a9a72305d48e55..df201786445b17d7e6da62321471d61094791ced 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-2,7
+2,7
@@
## This file is part of the PulseView project.
##
## Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
## This file is part of the PulseView project.
##
## Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
-## Copyright (C) 2012 Alexandru Gagniuc <mr.nuke.me@gmail.com>
+## Copyright (C) 2012
-2013
Alexandru Gagniuc <mr.nuke.me@gmail.com>
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@
-53,12
+53,16
@@
pkg_check_modules(PKGDEPS REQUIRED
find_package(Qt4 REQUIRED)
find_package(Qt4 REQUIRED)
+# Find the platform's thread library (needed for boost-thread).
+# This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
+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*).
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.4
5 COMPONENTS system thread_win32
)
+find_package(Boost 1.4
2 COMPONENTS system thread_win32 REQUIRED
)
else()
else()
-find_package(Boost 1.4
5 COMPONENTS system thread
)
+find_package(Boost 1.4
2 COMPONENTS system thread REQUIRED
)
endif()
#===============================================================================
endif()
#===============================================================================
@@
-86,8
+90,8
@@
configure_file (
set(pulseview_SOURCES
main.cpp
set(pulseview_SOURCES
main.cpp
+ signalhandler.cpp
pv/mainwindow.cpp
pv/mainwindow.cpp
- pv/samplingbar.cpp
pv/sigsession.cpp
pv/data/analog.cpp
pv/data/analogsnapshot.cpp
pv/sigsession.cpp
pv/data/analog.cpp
pv/data/analogsnapshot.cpp
@@
-96,11
+100,15
@@
set(pulseview_SOURCES
pv/data/signaldata.cpp
pv/data/snapshot.cpp
pv/dialogs/about.cpp
pv/data/signaldata.cpp
pv/data/snapshot.cpp
pv/dialogs/about.cpp
- pv/dialogs/hwcap.cpp
+ pv/dialogs/connect.cpp
+ pv/dialogs/deviceoptions.cpp
+ pv/prop/bool.cpp
+ pv/prop/double.cpp
pv/prop/enum.cpp
pv/prop/property.cpp
pv/prop/binding/binding.cpp
pv/prop/enum.cpp
pv/prop/property.cpp
pv/prop/binding/binding.cpp
- pv/prop/binding/hwcap.cpp
+ pv/prop/binding/deviceoptions.cpp
+ pv/toolbars/samplingbar.cpp
pv/view/analogsignal.cpp
pv/view/cursor.cpp
pv/view/header.cpp
pv/view/analogsignal.cpp
pv/view/cursor.cpp
pv/view/header.cpp
@@
-113,10
+121,13
@@
set(pulseview_SOURCES
)
set(pulseview_HEADERS
)
set(pulseview_HEADERS
+ signalhandler.h
pv/mainwindow.h
pv/mainwindow.h
- pv/samplingbar.h
pv/sigsession.h
pv/dialogs/about.h
pv/sigsession.h
pv/dialogs/about.h
+ pv/dialogs/connect.h
+ pv/dialogs/deviceoptions.h
+ pv/toolbars/samplingbar.h
pv/view/cursor.h
pv/view/header.h
pv/view/ruler.h
pv/view/cursor.h
pv/view/header.h
pv/view/ruler.h
@@
-144,7
+155,7
@@
include(${QT_USE_FILE})
#-------------------------------------------------------------------------------
add_definitions(${QT_DEFINITIONS})
#-------------------------------------------------------------------------------
add_definitions(${QT_DEFINITIONS})
-add_definitions(-Wextra)
+add_definitions(-W
all -W
extra)
if(NOT DISABLE_WERROR)
add_definitions(-Werror)
if(NOT DISABLE_WERROR)
add_definitions(-Werror)
@@
-174,6
+185,7
@@
link_directories(${Boost_LIBRARY_DIRS})
set(PULSEVIEW_LINK_LIBS
${Boost_LIBRARIES}
set(PULSEVIEW_LINK_LIBS
${Boost_LIBRARIES}
+ ${CMAKE_THREAD_LIBS_INIT}
${QT_LIBRARIES}
)
${QT_LIBRARIES}
)