X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=270a2e2efec05b297c627c15b53a991b7139806a;hp=0d9b455f2316548c71507a746fe95c4e241601e9;hb=96e282c4262cc0b4076472a60b9f870e279e1c0b;hpb=e7ab88e3684b4a56a4c3854945371739cb5d9b5f diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d9b455f..270a2e2e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ ## along with this program. If not, see . ## -cmake_minimum_required(VERSION 2.8.6) +cmake_minimum_required(VERSION 2.8.12) include(GNUInstallDirs) @@ -55,10 +55,13 @@ endif() #= Dependencies #------------------------------------------------------------------------------- -list(APPEND PKGDEPS libsigrokcxx>=0.4.0) +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) if(ENABLE_DECODE) - list(APPEND PKGDEPS libsigrokdecode>=0.4.0) + list(APPEND PKGDEPS libsigrokdecode>=0.5.0) endif() if(ANDROID) @@ -68,10 +71,9 @@ endif() find_package(PkgConfig) pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS}) -find_package(Qt5Core REQUIRED) -find_package(Qt5Widgets REQUIRED) -find_package(Qt5Gui REQUIRED) -find_package(Qt5Svg REQUIRED) +set(CMAKE_AUTOMOC TRUE) + +find_package(Qt5 COMPONENTS Core Gui Widgets Svg REQUIRED) if(WIN32) # MXE workaround: Use pkg-config to find Qt5 libs. @@ -79,10 +81,7 @@ if(WIN32) pkg_check_modules(QT5ALL REQUIRED Qt5Widgets Qt5Gui Qt5Svg) endif() -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") -set(QT_INCLUDE_DIRS ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}) set(QT_LIBRARIES Qt5::Gui Qt5::Widgets Qt5::Svg) -add_definitions(${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}) set(BOOSTCOMPS filesystem serialization system) if(ENABLE_TESTS) @@ -154,9 +153,10 @@ memaccess_check_unaligned_le(HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS) #------------------------------------------------------------------------------- set(PV_TITLE PulseView) -set(PV_DESCRIPTION "A GUI for sigrok") set(PV_VERSION_STRING "0.4.0") +set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.4_VERSION}) + include(GetGitRevisionDescription) # Append the revision hash unless we are exactly on a tagged release. @@ -224,31 +224,31 @@ set(pulseview_SOURCES pv/prop/property.cpp pv/prop/string.cpp pv/toolbars/mainbar.cpp - pv/view/analogsignal.cpp - pv/view/cursor.cpp - pv/view/cursorpair.cpp - pv/view/flag.cpp - pv/view/header.cpp - pv/view/marginwidget.cpp - pv/view/logicsignal.cpp - pv/view/rowitem.cpp - pv/view/ruler.cpp - pv/view/signal.cpp - pv/view/signalscalehandle.cpp - pv/view/timeitem.cpp - pv/view/timemarker.cpp - pv/view/trace.cpp - pv/view/tracegroup.cpp - pv/view/tracepalette.cpp - pv/view/tracetreeitem.cpp - pv/view/tracetreeitemowner.cpp - pv/view/triggermarker.cpp - pv/view/view.cpp - pv/view/viewitem.cpp - pv/view/viewitemowner.cpp - pv/view/viewitempaintparams.cpp - pv/view/viewport.cpp - pv/view/viewwidget.cpp + pv/views/trace/analogsignal.cpp + pv/views/trace/cursor.cpp + pv/views/trace/cursorpair.cpp + pv/views/trace/flag.cpp + pv/views/trace/header.cpp + pv/views/trace/marginwidget.cpp + pv/views/trace/logicsignal.cpp + 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 + pv/views/trace/tracegroup.cpp + pv/views/trace/tracepalette.cpp + pv/views/trace/tracetreeitem.cpp + pv/views/trace/tracetreeitemowner.cpp + pv/views/trace/triggermarker.cpp + pv/views/trace/view.cpp + pv/views/trace/viewitem.cpp + pv/views/trace/viewitemowner.cpp + pv/views/trace/viewitempaintparams.cpp + pv/views/trace/viewport.cpp + pv/views/trace/viewwidget.cpp pv/views/viewbase.cpp pv/views/trace/standardbar.cpp pv/widgets/colourbutton.cpp @@ -288,26 +288,26 @@ set(pulseview_HEADERS pv/prop/property.hpp pv/prop/string.hpp pv/toolbars/mainbar.hpp - pv/view/analogsignal.hpp - pv/view/cursor.hpp - pv/view/flag.hpp - pv/view/header.hpp - pv/view/logicsignal.hpp - pv/view/marginwidget.hpp - pv/view/rowitem.hpp - pv/view/ruler.hpp - pv/view/signal.hpp - pv/view/signalscalehandle.hpp - pv/view/timeitem.hpp - pv/view/timemarker.hpp - pv/view/trace.hpp - pv/view/tracegroup.hpp - pv/view/tracetreeitem.hpp - pv/view/triggermarker.hpp - pv/view/view.hpp - pv/view/viewitem.hpp - pv/view/viewport.hpp - pv/view/viewwidget.hpp + pv/views/trace/analogsignal.hpp + pv/views/trace/cursor.hpp + pv/views/trace/flag.hpp + pv/views/trace/header.hpp + pv/views/trace/logicsignal.hpp + pv/views/trace/marginwidget.hpp + 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 + pv/views/trace/tracegroup.hpp + pv/views/trace/tracetreeitem.hpp + pv/views/trace/triggermarker.hpp + pv/views/trace/view.hpp + pv/views/trace/viewitem.hpp + pv/views/trace/viewport.hpp + pv/views/trace/viewwidget.hpp pv/views/viewbase.hpp pv/views/trace/standardbar.hpp pv/widgets/colourbutton.hpp @@ -339,14 +339,14 @@ if(ENABLE_DECODE) pv/data/decode/decoder.cpp pv/data/decode/row.cpp pv/data/decode/rowdata.cpp - pv/view/decodetrace.cpp + pv/views/trace/decodetrace.cpp pv/widgets/decodergroupbox.cpp pv/widgets/decodermenu.cpp ) list(APPEND pulseview_HEADERS pv/data/decoderstack.hpp - pv/view/decodetrace.hpp + pv/views/trace/decodetrace.hpp pv/widgets/decodergroupbox.hpp pv/widgets/decodermenu.hpp ) @@ -366,14 +366,13 @@ if(ANDROID) ) endif() -qt5_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS}) qt5_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES}) #=============================================================================== #= Global Definitions #------------------------------------------------------------------------------- -add_definitions(${QT_DEFINITIONS} -DQT_NO_KEYWORDS) +add_definitions(-DQT_NO_KEYWORDS) add_definitions(-D__STDC_LIMIT_MACROS) add_definitions(-Wall -Wextra) add_definitions(-std=c++11) @@ -399,7 +398,6 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${Boost_INCLUDE_DIRS} - ${QT_INCLUDE_DIRS} ) if(STATIC_PKGDEPS_LIBS) @@ -445,17 +443,9 @@ if(ANDROID) endif() if(ANDROID) -add_library(${PROJECT_NAME} SHARED - ${pulseview_SOURCES} - ${pulseview_HEADERS_MOC} - ${pulseview_RESOURCES_RCC} -) + add_library(${PROJECT_NAME} SHARED ${pulseview_SOURCES} ${pulseview_RESOURCES_RCC}) else() -add_executable(${PROJECT_NAME} - ${pulseview_SOURCES} - ${pulseview_HEADERS_MOC} - ${pulseview_RESOURCES_RCC} -) + add_executable(${PROJECT_NAME} ${pulseview_SOURCES} ${pulseview_RESOURCES_RCC}) endif() target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS}) @@ -475,6 +465,9 @@ install(TARGETS ${PROJECT_NAME} DESTINATION bin/) # Install the manpage. install(FILES doc/pulseview.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT doc) +# Install the desktop file. +install(FILES contrib/org.sigrok.PulseView.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) + # Generate Windows installer script. configure_file(contrib/pulseview_cross.nsi.in contrib/pulseview_cross.nsi @ONLY)