TimeMarker: Fixed position of set_time function

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 05c6270c5ded577531ae15bb1138731f66b4c092..401f918d82fd61c23b48b283be651d11d9bc65d3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
 option(DISABLE_WERROR "Build without -Werror" FALSE)
 option(ENABLE_SIGNALS "Build with UNIX signals" TRUE)
 option(ENABLE_DECODE "Build with libsigrokdecode" TRUE)
-option(ENABLE_COTIRE "Enable cotire" FALSE)
 option(ENABLE_TESTS "Enable unit tests" FALSE)
 option(STATIC_PKGDEPS_LIBS "Statically link to (pkg-config) libraries" FALSE)
 option(FORCE_QT4 "Force use of Qt4 even if Qt5 is available" FALSE)
@@ -48,14 +47,18 @@ 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()
 
 if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
-      "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
-      FORCE)
+       set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
+       "Choose the type of build (None, Debug, Release, RelWithDebInfo, MinSizeRel)."
+       FORCE)
 endif()
 
 #===============================================================================
@@ -95,10 +98,8 @@ else()
        find_package(Qt4 REQUIRED QtCore QtGui QtSvg)
 endif()
 
-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)
+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()
@@ -142,15 +143,15 @@ set(pulseview_SOURCES
        pv/application.cpp
        pv/devicemanager.cpp
        pv/mainwindow.cpp
-       pv/sigsession.cpp
+       pv/session.cpp
        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
@@ -175,13 +176,15 @@ set(pulseview_SOURCES
        pv/view/rowitem.cpp
        pv/view/rowitemowner.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
        pv/view/tracepalette.cpp
        pv/view/view.cpp
+       pv/view/viewitem.cpp
+       pv/view/viewitempaintparams.cpp
        pv/view/viewport.cpp
        pv/widgets/colourbutton.cpp
        pv/widgets/colourpopup.cpp
@@ -194,7 +197,7 @@ set(pulseview_SOURCES
 # This list includes only QObject derived class headers.
 set(pulseview_HEADERS
        pv/mainwindow.hpp
-       pv/sigsession.hpp
+       pv/session.hpp
        pv/storesession.hpp
        pv/dialogs/about.hpp
        pv/dialogs/connect.hpp
@@ -216,12 +219,13 @@ set(pulseview_HEADERS
        pv/view/marginwidget.hpp
        pv/view/rowitem.hpp
        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
        pv/view/view.hpp
+       pv/view/viewitem.hpp
        pv/view/viewport.hpp
        pv/widgets/colourbutton.hpp
        pv/widgets/colourpopup.hpp
@@ -385,11 +389,6 @@ if(WIN32)
        set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-mwindows")
 endif()
 
-if(ENABLE_COTIRE)
-       include(cotire)
-       cotire(${PROJECT_NAME})
-endif()
-
 #===============================================================================
 #= Installation
 #-------------------------------------------------------------------------------