X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=c8b4d6ad08740a1d9404db304e9d182bff80cf25;hp=39f0c07f57dd96fdc4396569b2596a357c616412;hb=b732b48fafdb5d237248a56764e184e10281a712;hpb=477472187338948c83bea5d790ead66034008296 diff --git a/CMakeLists.txt b/CMakeLists.txt index 39f0c07f..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 @@ -450,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()