X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=58365a10d04e60b38f866e12f61670d96d366e3c;hp=a5a910456e8b5c053b92bd10da576dd78fde247e;hb=df840662d228637f84d44ec24005e8b9bed8628f;hpb=7ba41e7ec7e575ae34ed2af33920c6e843aaac4d diff --git a/CMakeLists.txt b/CMakeLists.txt index a5a91045..58365a10 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,6 @@ project(pulseview) option(DISABLE_WERROR "Build without -Werror" FALSE) option(ENABLE_SIGNALS "Build with UNIX signals" TRUE) -option(ENABLE_SIGROKDECODE "Build with libsigrokdecode" FALSE) option(ENABLE_TESTS "Enable unit tests" FALSE) option(STATIC_PKGDEPS_LIBS "Statically link to (pkgconfig) libraries" FALSE) @@ -57,12 +56,9 @@ endif() list(APPEND PKGDEPS libsigrok>=0.2.0 + libsigrokdecode>=0.2.0 ) -if(ENABLE_SIGROKDECODE) - list(APPEND PKGDEPS libsigrokdecode>=0.2.0) -endif() - find_package(PkgConfig) pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS}) @@ -117,6 +113,7 @@ set(pulseview_SOURCES pv/data/snapshot.cpp pv/dialogs/about.cpp pv/dialogs/connect.cpp + pv/dialogs/decoder.cpp pv/dialogs/deviceoptions.cpp pv/prop/bool.cpp pv/prop/double.cpp @@ -190,10 +187,6 @@ include(${QT_USE_FILE}) add_definitions(${QT_DEFINITIONS}) add_definitions(-Wall -Wextra) -if(ENABLE_SIGROKDECODE) - add_definitions(-DENABLE_SIGROKDECODE) -endif() - if(NOT DISABLE_WERROR) add_definitions(-Werror) endif()