X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=c8b4d6ad08740a1d9404db304e9d182bff80cf25;hp=b51753b6f790e6e1ca7849c344c0e2b14b34a10c;hb=056f443e2a6f8db80161ce08d7ff8111175bc3d6;hpb=ad908057e13224eee9f983685e0ccc7db1ded0e9

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b51753b6..c8b4d6ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,10 +58,10 @@ endif()
 list(APPEND PKGDEPS glib-2.0>=2.28.0)
 list(APPEND PKGDEPS glibmm-2.4>=2.28.0)
 
-list(APPEND PKGDEPS libsigrokcxx>=0.5.0)
+list(APPEND PKGDEPS libsigrokcxx>=0.6.0)
 
 if(ENABLE_DECODE)
-	list(APPEND PKGDEPS libsigrokdecode>=0.5.0)
+	list(APPEND PKGDEPS libsigrokdecode>=0.6.0)
 endif()
 
 if(ANDROID)
@@ -234,7 +234,6 @@ set(pulseview_SOURCES
 	pv/views/trace/rowitem.cpp
 	pv/views/trace/ruler.cpp
 	pv/views/trace/signal.cpp
-	pv/views/trace/signalscalehandle.cpp
 	pv/views/trace/timeitem.cpp
 	pv/views/trace/timemarker.cpp
 	pv/views/trace/trace.cpp
@@ -297,7 +296,6 @@ set(pulseview_HEADERS
 	pv/views/trace/rowitem.hpp
 	pv/views/trace/ruler.hpp
 	pv/views/trace/signal.hpp
-	pv/views/trace/signalscalehandle.hpp
 	pv/views/trace/timeitem.hpp
 	pv/views/trace/timemarker.hpp
 	pv/views/trace/trace.hpp
@@ -335,7 +333,6 @@ if(ENABLE_DECODE)
 	list(APPEND pulseview_SOURCES
 		pv/binding/decoder.cpp
 		pv/data/decodesignal.cpp
-		pv/data/decoderstack.cpp
 		pv/data/decode/annotation.cpp
 		pv/data/decode/decoder.cpp
 		pv/data/decode/row.cpp
@@ -347,7 +344,6 @@ if(ENABLE_DECODE)
 
 	list(APPEND pulseview_HEADERS
 		pv/data/decodesignal.hpp
-		pv/data/decoderstack.hpp
 		pv/views/trace/decodetrace.hpp
 		pv/widgets/decodergroupbox.hpp
 		pv/widgets/decodermenu.hpp
@@ -452,7 +448,7 @@ endif()
 
 target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})
 
-if(WIN32)
+if(WIN32 AND NOT ${CMAKE_BUILD_TYPE} STREQUAL "Debug")
 	# Pass -mwindows so that no "DOS box" opens when PulseView is started.
 	set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-mwindows")
 endif()