projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor whitespace fixes.
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index f9c53f4062b0bbd3e719d8ed5665adb7872d90f9..722b764c26b6cc09ccc8867e601c934426ede6b7 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,17
+53,16
@@
pkg_check_modules(PKGDEPS REQUIRED
find_package(Qt4 REQUIRED)
find_package(Qt4 REQUIRED)
-# On Windows/MinGW we explicitly point cmake to the Boost directory.
-if(WIN32)
- set(BOOST_ROOT /usr/local)
-endif()
+# 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()
#===============================================================================
@@
-101,11
+100,11
@@
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/
deviceoptions
.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/view/analogsignal.cpp
pv/view/cursor.cpp
pv/view/header.cpp
pv/view/analogsignal.cpp
pv/view/cursor.cpp
pv/view/header.cpp
@@
-149,7
+148,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)
@@
-179,6
+178,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}
)