projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
samplingbar.cpp: Add missing "ULL".
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index b1208d64d256c6989da9ebe90b72adef3b51efdf..d3ee6212c7a524d5bc5c7d8413d22f4039a11ad1 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-27,6
+27,7
@@
project(pulseview)
#= User Options
#-------------------------------------------------------------------------------
#= User Options
#-------------------------------------------------------------------------------
+option(DISABLE_WERROR "Build without -Werror" 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,7
+54,13
@@
if(WIN32)
set(BOOST_ROOT /usr/local)
endif()
set(BOOST_ROOT /usr/local)
endif()
+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.46 COMPONENTS system thread_win32)
+else()
find_package(Boost 1.46 COMPONENTS system thread)
find_package(Boost 1.46 COMPONENTS system thread)
+endif()
#===============================================================================
#= Config Header
#===============================================================================
#= Config Header
@@
-90,6
+97,10
@@
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/prop/enum.cpp
+ pv/prop/property.cpp
+ pv/prop/binding/binding.cpp
pv/prop/binding/hwcap.cpp
pv/view/analogsignal.cpp
pv/view/cursor.cpp
pv/prop/binding/hwcap.cpp
pv/view/analogsignal.cpp
pv/view/cursor.cpp
@@
-134,7
+145,11
@@
include(${QT_USE_FILE})
#-------------------------------------------------------------------------------
add_definitions(${QT_DEFINITIONS})
#-------------------------------------------------------------------------------
add_definitions(${QT_DEFINITIONS})
-add_definitions(-Werror -Wall)
+add_definitions(-Wextra)
+
+if(NOT DISABLE_WERROR)
+ add_definitions(-Werror)
+endif()
#===============================================================================
#= Global Include Directories
#===============================================================================
#= Global Include Directories