pv::data::DecoderStack: Set _row for each annotation.

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5542e2868b3dc96f2d194d19e8fba46063661999..acec89764da6c3453d6c222555e36c11e5c51750 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,6 +51,12 @@ if(WIN32)
        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)
+endif()
+
 #===============================================================================
 #= Dependencies
 #-------------------------------------------------------------------------------
@@ -146,6 +152,7 @@ set(pulseview_SOURCES
        pv/widgets/colourpopup.cpp
        pv/widgets/popup.cpp
        pv/widgets/popuptoolbutton.cpp
+       pv/widgets/sweeptimingwidget.cpp
        pv/widgets/wellarray.cpp
 )
 
@@ -181,6 +188,7 @@ set(pulseview_HEADERS
        pv/widgets/colourpopup.h
        pv/widgets/popup.h
        pv/widgets/popuptoolbutton.h
+       pv/widgets/sweeptimingwidget.h
        pv/widgets/wellarray.h
 )
 
@@ -276,6 +284,10 @@ set(PULSEVIEW_LINK_LIBS
 if(STATIC_PKGDEPS_LIBS)
        link_directories(${PKGDEPS_STATIC_LIBRARY_DIRS})
        list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_STATIC_LIBRARIES})
+if(WIN32)
+       # Workaround for a MinGW linking issue.
+       list(APPEND PULSEVIEW_LINK_LIBS "-llzma -llcms2")
+endif()
 else()
        link_directories(${PKGDEPS_LIBRARY_DIRS})
        list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_LIBRARIES})