list(APPEND PKGDEPS libsigrokflow>=0.1.0)
endif()
-set(LIBSR_CXX_BINDING "libsigrokcxx>=0.5.1")
+set(LIBSR_CXX_BINDING "libsigrokcxx>=0.5.2")
list(APPEND PKGDEPS "${LIBSR_CXX_BINDING}")
if(ENABLE_DECODE)
endif()
if(ENABLE_STACKTRACE)
+ include(FindBacktrace)
+ if (Backtrace_FOUND)
+ set(_Boost_STACKTRACE_BACKTRACE_HEADERS "boost/stacktrace.hpp")
+ list(APPEND BOOSTCOMPS stacktrace_backtrace)
+ else()
+ set(_Boost_STACKTRACE_BASIC_HEADERS "boost/stacktrace.hpp")
+ list(APPEND BOOSTCOMPS stacktrace_basic)
+ endif()
find_package(Boost 1.65.1 COMPONENTS ${BOOSTCOMPS} REQUIRED)
else()
find_package(Boost 1.55 COMPONENTS ${BOOSTCOMPS} REQUIRED)
pv/globalsettings.cpp
pv/logging.cpp
pv/mainwindow.cpp
+ pv/metadata_obj.cpp
pv/session.cpp
pv/storesession.cpp
pv/util.cpp
pv/logging.hpp
pv/globalsettings.hpp
pv/mainwindow.hpp
+ pv/metadata_obj.hpp
pv/session.hpp
pv/storesession.hpp
pv/binding/device.hpp
pv/subwindows/decoder_selector/item.cpp
pv/subwindows/decoder_selector/model.cpp
pv/subwindows/decoder_selector/subwindow.cpp
- pv/views/decoder_output/view.cpp
- pv/views/decoder_output/QHexView.cpp
+ pv/views/decoder_binary/view.cpp
+ pv/views/decoder_binary/QHexView.cpp
+ pv/views/tabular_decoder/model.cpp
+ pv/views/tabular_decoder/view.cpp
pv/views/trace/decodetrace.cpp
pv/widgets/decodergroupbox.cpp
pv/widgets/decodermenu.cpp
list(APPEND pulseview_HEADERS
pv/data/decodesignal.hpp
pv/subwindows/decoder_selector/subwindow.hpp
- pv/views/decoder_output/view.hpp
- pv/views/decoder_output/QHexView.hpp
+ pv/views/decoder_binary/view.hpp
+ pv/views/decoder_binary/QHexView.hpp
+ pv/views/tabular_decoder/view.hpp
pv/views/trace/decodetrace.hpp
pv/widgets/decodergroupbox.hpp
pv/widgets/decodermenu.hpp
endif()
if(ENABLE_STACKTRACE)
- add_definitions(-DENABLE_STACKTRACE)
+ add_definitions(-DENABLE_STACKTRACE -no-pie -fno-pie)
+ if (Backtrace_FOUND)
+ add_definitions(-DBOOST_STACKTRACE_USE_BACKTRACE)
+ endif()
endif()
#===============================================================================
endif()
if(ENABLE_STACKTRACE)
- # Needed to resolve dladdr.
- list(APPEND PULSEVIEW_LINK_LIBS "-ldl")
+ list(APPEND PULSEVIEW_LINK_LIBS ${CMAKE_DL_LIBS} ${Backtrace_LIBRARIES})
+ link_libraries("-no-pie -fno-pie")
endif()
if(ANDROID)
list(APPEND PULSEVIEW_LINK_LIBS "-llog")
endif()
+set(INPUT_FILES_LIST ${pulseview_SOURCES} ${pulseview_RESOURCES_RCC} ${QM_FILES})
if(ANDROID)
- add_library(${PROJECT_NAME} SHARED ${pulseview_SOURCES} ${pulseview_RESOURCES_RCC} ${QM_FILES})
+ add_library(${PROJECT_NAME} SHARED ${INPUT_FILES_LIST})
else()
- add_executable(${PROJECT_NAME} ${pulseview_SOURCES} ${pulseview_RESOURCES_RCC} ${QM_FILES})
+ add_executable(${PROJECT_NAME} ${INPUT_FILES_LIST})
endif()
target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})