X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=edac86111c77c4f256096afd98a694a55ea64450;hp=2ba907af96be14167535429551873a751d639c04;hb=3d4f16afefc094af1a831c1d2abb68cb6d466ac2;hpb=1198b8872516662c257e5dcdec346094ed4f32dd

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ba907af..edac8611 100644
--- 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
 #-------------------------------------------------------------------------------
@@ -105,6 +111,7 @@ configure_file (
 set(pulseview_SOURCES
 	main.cpp
 	pv/devicemanager.cpp
+	pv/devinst.cpp
 	pv/mainwindow.cpp
 	pv/sigsession.cpp
 	pv/storesession.cpp
@@ -152,6 +159,7 @@ set(pulseview_SOURCES
 
 # This list includes only QObject derived class headers.
 set(pulseview_HEADERS
+	pv/devinst.h
 	pv/mainwindow.h
 	pv/sigsession.h
 	pv/storesession.h
@@ -204,6 +212,8 @@ if(ENABLE_DECODE)
 		pv/data/decoderstack.cpp
 		pv/data/decode/annotation.cpp
 		pv/data/decode/decoder.cpp
+		pv/data/decode/row.cpp
+		pv/data/decode/rowdata.cpp
 		pv/prop/binding/decoderoptions.cpp
 		pv/view/decodetrace.cpp
 		pv/widgets/decodergroupbox.cpp
@@ -278,6 +288,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})