projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix build on systems with Qt5 installed
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 0a754020586f10839fadceef949d09d9a4f16559..ad226931dafdd978760b7fc0978e6ffd3ea27aae 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-62,6
+62,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_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).
@@
-120,13
+121,16
@@
set(pulseview_SOURCES
pv/prop/property.cpp
pv/prop/binding/binding.cpp
pv/prop/binding/deviceoptions.cpp
pv/prop/property.cpp
pv/prop/binding/binding.cpp
pv/prop/binding/deviceoptions.cpp
+ pv/toolbars/contextbar.cpp
pv/toolbars/samplingbar.cpp
pv/view/analogsignal.cpp
pv/view/cursor.cpp
pv/view/cursorpair.cpp
pv/view/header.cpp
pv/toolbars/samplingbar.cpp
pv/view/analogsignal.cpp
pv/view/cursor.cpp
pv/view/cursorpair.cpp
pv/view/header.cpp
+ pv/view/marginwidget.cpp
pv/view/logicsignal.cpp
pv/view/ruler.cpp
pv/view/logicsignal.cpp
pv/view/ruler.cpp
+ pv/view/selectableitem.cpp
pv/view/signal.cpp
pv/view/timemarker.cpp
pv/view/view.cpp
pv/view/signal.cpp
pv/view/timemarker.cpp
pv/view/view.cpp
@@
-139,10
+143,14
@@
set(pulseview_HEADERS
pv/dialogs/about.h
pv/dialogs/connect.h
pv/dialogs/deviceoptions.h
pv/dialogs/about.h
pv/dialogs/connect.h
pv/dialogs/deviceoptions.h
+ pv/toolbars/contextbar.h
pv/toolbars/samplingbar.h
pv/view/cursor.h
pv/view/header.h
pv/toolbars/samplingbar.h
pv/view/cursor.h
pv/view/header.h
+ pv/view/marginwidget.h
pv/view/ruler.h
pv/view/ruler.h
+ pv/view/selectableitem.h
+ pv/view/signal.h
pv/view/timemarker.h
pv/view/view.h
pv/view/viewport.h
pv/view/timemarker.h
pv/view/view.h
pv/view/viewport.h