]> sigrok.org Git - pulseview.git/blobdiff - CMakeLists.txt
TimeItem: Added new class - a base of TimeMarker, derived from SelectableItem
[pulseview.git] / CMakeLists.txt
index 93021a644da7a7e0420388251d59d2785bdc27f7..036946c360984204b0dc7b8ec59abe9ed495831c 100644 (file)
@@ -47,6 +47,10 @@ if(WIN32)
        set(Boost_USE_STATIC_LIBS ON)
        add_definitions(-DBOOST_THREAD_USE_LIB)
 
+       # On Windows/MinGW we need to use 'thread_win32' instead of 'thread'.
+       # The library is named libboost_thread_win32* (not libboost_thread*).
+       set(Boost_THREADAPI win32)
+
        # Windows does not support UNIX signals.
        set(ENABLE_SIGNALS FALSE)
 endif()
@@ -94,21 +98,11 @@ else()
        find_package(Qt4 REQUIRED QtCore QtGui QtSvg)
 endif()
 
-if(WIN32)
-if(ENABLE_TESTS)
-       # 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 unit_test_framework REQUIRED)
-else()
-       find_package(Boost 1.42 COMPONENTS filesystem system thread_win32 REQUIRED)
-endif()
-else()
 if(ENABLE_TESTS)
        find_package(Boost 1.42 COMPONENTS filesystem system thread unit_test_framework REQUIRED)
 else()
        find_package(Boost 1.42 COMPONENTS filesystem system thread REQUIRED)
 endif()
-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.
@@ -153,11 +147,11 @@ set(pulseview_SOURCES
        pv/storesession.cpp
        pv/util.cpp
        pv/data/analog.cpp
-       pv/data/analogsnapshot.cpp
+       pv/data/analogsegment.cpp
        pv/data/logic.cpp
-       pv/data/logicsnapshot.cpp
+       pv/data/logicsegment.cpp
        pv/data/signaldata.cpp
-       pv/data/snapshot.cpp
+       pv/data/segment.cpp
        pv/dialogs/about.cpp
        pv/dialogs/connect.cpp
        pv/dialogs/storeprogress.cpp
@@ -181,9 +175,11 @@ set(pulseview_SOURCES
        pv/view/logicsignal.cpp
        pv/view/rowitem.cpp
        pv/view/rowitemowner.cpp
+       pv/view/rowitempaintparams.cpp
        pv/view/ruler.cpp
        pv/view/selectableitem.cpp
        pv/view/signal.cpp
+       pv/view/timeitem.cpp
        pv/view/timemarker.cpp
        pv/view/trace.cpp
        pv/view/tracegroup.cpp
@@ -225,6 +221,7 @@ set(pulseview_HEADERS
        pv/view/ruler.hpp
        pv/view/selectableitem.hpp
        pv/view/signal.hpp
+       pv/view/timeitem.hpp
        pv/view/timemarker.hpp
        pv/view/trace.hpp
        pv/view/tracegroup.hpp