Renamed C++ headers to .hpp

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index da3cc09cc096a1b2ef7bf73e80de6053dc2072c2..05c6270c5ded577531ae15bb1138731f66b4c092 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,6 +44,10 @@ if(WIN32)
        # This option is user configurable, but enable it by default on win32.
        set(STATIC_PKGDEPS_LIBS TRUE)
 
+       # For boost-thread we need two additional settings on win32:
+       set(Boost_USE_STATIC_LIBS ON)
+       add_definitions(-DBOOST_THREAD_USE_LIB)
+
        # Windows does not support UNIX signals.
        set(ENABLE_SIGNALS FALSE)
 endif()
@@ -91,7 +95,13 @@ else()
        find_package(Qt4 REQUIRED QtCore QtGui QtSvg)
 endif()
 
-find_package(Boost 1.42 COMPONENTS filesystem system REQUIRED)
+if(WIN32)
+       # 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 filesystem system thread_win32 REQUIRED)
+else()
+       find_package(Boost 1.42 COMPONENTS filesystem system thread REQUIRED)
+endif()
 
 # Find the platform's thread library (needed for C++11 threads).
 # This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
@@ -162,11 +172,14 @@ set(pulseview_SOURCES
        pv/view/header.cpp
        pv/view/marginwidget.cpp
        pv/view/logicsignal.cpp
+       pv/view/rowitem.cpp
+       pv/view/rowitemowner.cpp
        pv/view/ruler.cpp
        pv/view/selectableitem.cpp
        pv/view/signal.cpp
        pv/view/timemarker.cpp
        pv/view/trace.cpp
+       pv/view/tracegroup.cpp
        pv/view/tracepalette.cpp
        pv/view/view.cpp
        pv/view/viewport.cpp
@@ -180,40 +193,42 @@ set(pulseview_SOURCES
 
 # This list includes only QObject derived class headers.
 set(pulseview_HEADERS
-       pv/mainwindow.h
-       pv/sigsession.h
-       pv/storesession.h
-       pv/dialogs/about.h
-       pv/dialogs/connect.h
-       pv/dialogs/storeprogress.h
-       pv/popups/channels.h
-       pv/popups/deviceoptions.h
-       pv/prop/bool.h
-       pv/prop/double.h
-       pv/prop/enum.h
-       pv/prop/int.h
-       pv/prop/property.h
-       pv/prop/string.h
-       pv/prop/binding/deviceoptions.h
-       pv/toolbars/samplingbar.h
-       pv/view/cursor.h
-       pv/view/cursorheader.h
-       pv/view/header.h
-       pv/view/logicsignal.h
-       pv/view/marginwidget.h
-       pv/view/ruler.h
-       pv/view/selectableitem.h
-       pv/view/signal.h
-       pv/view/timemarker.h
-       pv/view/trace.h
-       pv/view/view.h
-       pv/view/viewport.h
-       pv/widgets/colourbutton.h
-       pv/widgets/colourpopup.h
-       pv/widgets/popup.h
-       pv/widgets/popuptoolbutton.h
-       pv/widgets/sweeptimingwidget.h
-       pv/widgets/wellarray.h
+       pv/mainwindow.hpp
+       pv/sigsession.hpp
+       pv/storesession.hpp
+       pv/dialogs/about.hpp
+       pv/dialogs/connect.hpp
+       pv/dialogs/storeprogress.hpp
+       pv/popups/channels.hpp
+       pv/popups/deviceoptions.hpp
+       pv/prop/bool.hpp
+       pv/prop/double.hpp
+       pv/prop/enum.hpp
+       pv/prop/int.hpp
+       pv/prop/property.hpp
+       pv/prop/string.hpp
+       pv/prop/binding/deviceoptions.hpp
+       pv/toolbars/samplingbar.hpp
+       pv/view/cursor.hpp
+       pv/view/cursorheader.hpp
+       pv/view/header.hpp
+       pv/view/logicsignal.hpp
+       pv/view/marginwidget.hpp
+       pv/view/rowitem.hpp
+       pv/view/ruler.hpp
+       pv/view/selectableitem.hpp
+       pv/view/signal.hpp
+       pv/view/timemarker.hpp
+       pv/view/trace.hpp
+       pv/view/tracegroup.hpp
+       pv/view/view.hpp
+       pv/view/viewport.hpp
+       pv/widgets/colourbutton.hpp
+       pv/widgets/colourpopup.hpp
+       pv/widgets/popup.hpp
+       pv/widgets/popuptoolbutton.hpp
+       pv/widgets/sweeptimingwidget.hpp
+       pv/widgets/wellarray.hpp
 )
 
 set(pulseview_FORMS
@@ -226,7 +241,7 @@ set(pulseview_RESOURCES
 
 if(ENABLE_SIGNALS)
        list(APPEND pulseview_SOURCES signalhandler.cpp)
-       list(APPEND pulseview_HEADERS signalhandler.h)
+       list(APPEND pulseview_HEADERS signalhandler.hpp)
 endif()
 
 if(ENABLE_DECODE)
@@ -243,10 +258,10 @@ if(ENABLE_DECODE)
        )
 
        list(APPEND pulseview_HEADERS
-               pv/data/decoderstack.h
-               pv/view/decodetrace.h
-               pv/widgets/decodergroupbox.h
-               pv/widgets/decodermenu.h
+               pv/data/decoderstack.hpp
+               pv/view/decodetrace.hpp
+               pv/widgets/decodergroupbox.hpp
+               pv/widgets/decodermenu.hpp
        )
 endif()