Fix build on MinGW (boost thread related).

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4af1f67bdaed73fee301c85b3ed5af3758434652..136880e0d276eb1423fc2965f901a9a5fc4626f7 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()
@@ -88,11 +92,16 @@ if(Qt5Core_FOUND)
        add_definitions(${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS})
 else()
        find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac)
-       find_package(Qt4 REQUIRED)
-       set(QT_USE_QTSVG TRUE)
+       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.
@@ -163,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
@@ -202,11 +214,13 @@ set(pulseview_HEADERS
        pv/view/header.h
        pv/view/logicsignal.h
        pv/view/marginwidget.h
+       pv/view/rowitem.h
        pv/view/ruler.h
        pv/view/selectableitem.h
        pv/view/signal.h
        pv/view/timemarker.h
        pv/view/trace.h
+       pv/view/tracegroup.h
        pv/view/view.h
        pv/view/viewport.h
        pv/widgets/colourbutton.h
@@ -340,8 +354,8 @@ if(WIN32)
        # plugin (and the QtSvg component) for SVG graphics/icons to work.
        add_definitions(-DQT_STATICPLUGIN)
        link_directories("${QT_PLUGINS_DIR}/imageformats")
-       list(APPEND PULSEVIEW_LINK_LIBS ${QT_QTSVG_LIBRARY})
        list(APPEND PULSEVIEW_LINK_LIBS "-lqsvg")
+       list(APPEND PULSEVIEW_LINK_LIBS ${QT_QTSVG_LIBRARY})
 endif()
 
 if(ANDROID)