X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=069ccd898b8be8501434840c16db3c28325b1750;hp=96b3a1ed1056f7ead12e39346e6f5ef449ff89fe;hb=aff5174622cf79c6d42c0adbcb9ddbafdf1b96d1;hpb=ab186d22b223c95810bdd603db55568a14ba5de8 diff --git a/CMakeLists.txt b/CMakeLists.txt index 96b3a1ed..069ccd89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,16 +37,13 @@ option(ENABLE_DECODE "Build with libsigrokdecode" TRUE) option(ENABLE_COTIRE "Enable cotire" FALSE) option(ENABLE_TESTS "Enable unit tests" FALSE) option(STATIC_PKGDEPS_LIBS "Statically link to (pkg-config) libraries" FALSE) +option(FORCE_QT4 "Force use of Qt4 even if Qt5 is available" FALSE) if(WIN32) # On Windows/MinGW we need to statically link to libraries. # This option is user configurable, but enable it by default on win32. set(STATIC_PKGDEPS_LIBS TRUE) - # For boost-thread we need two additional settings on win32: - set(Boost_USE_STATIC_LIBS ON) - add_definitions(-DBOOST_THREAD_USE_LIB) - # Windows does not support UNIX signals. set(ENABLE_SIGNALS FALSE) endif() @@ -67,24 +64,34 @@ if(ENABLE_DECODE) list(APPEND PKGDEPS libsigrokdecode>=0.3.0) endif() +if(ANDROID) + list(APPEND PKGDEPS libsigrokandroidutils>=0.1.0) +endif() + find_package(PkgConfig) pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS}) -find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac) -find_package(Qt4 REQUIRED) - -# Find the platform's thread library (needed for boost-thread). -# This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value. -find_package(Threads) +if(FORCE_QT4) + set(Qt5Core_FOUND FALSE) +else() + find_package(Qt5Core QUIET) +endif() -if(WIN32) - # On Windows/MinGW we need to use 'thread_win32' instead of 'thread'. - # The library is named libboost_thread_win32* (not libboost_thread*). - find_package(Boost 1.42 COMPONENTS filesystem system thread_win32 REQUIRED) +if(Qt5Core_FOUND) + message("-- Using Qt5") + find_package(Qt5Widgets REQUIRED) + find_package(Qt5Gui REQUIRED) + 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) + add_definitions(${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}) else() - find_package(Boost 1.42 COMPONENTS filesystem system thread REQUIRED) + find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac) + find_package(Qt4 REQUIRED) endif() +find_package(Boost 1.42 COMPONENTS filesystem system REQUIRED) + #=============================================================================== #= System Introspection #------------------------------------------------------------------------------- @@ -100,7 +107,7 @@ set(PV_TITLE PulseView) set(PV_DESCRIPTION "A GUI for sigrok") set(PV_VERSION_MAJOR 0) -set(PV_VERSION_MINOR 1) +set(PV_VERSION_MINOR 2) set(PV_VERSION_MICRO 0) set(PV_VERSION_STRING ${PV_VERSION_MAJOR}.${PV_VERSION_MINOR}.${PV_VERSION_MICRO} @@ -121,6 +128,7 @@ set(pulseview_SOURCES pv/mainwindow.cpp pv/sigsession.cpp pv/storesession.cpp + pv/util.cpp pv/data/analog.cpp pv/data/analogsnapshot.cpp pv/data/logic.cpp @@ -148,6 +156,7 @@ set(pulseview_SOURCES pv/toolbars/samplingbar.cpp pv/view/analogsignal.cpp pv/view/cursor.cpp + pv/view/cursorheader.cpp pv/view/cursorpair.cpp pv/view/header.cpp pv/view/marginwidget.cpp @@ -187,6 +196,7 @@ set(pulseview_HEADERS pv/prop/string.h pv/toolbars/samplingbar.h pv/view/cursor.h + pv/view/cursorheader.h pv/view/header.h pv/view/logicsignal.h pv/view/marginwidget.h @@ -246,11 +256,20 @@ if(WIN32) list(APPEND pulseview_SOURCES pulseviewico.rc) endif() -qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS}) -qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS}) -qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES}) +if(ANDROID) + list(APPEND pulseview_SOURCES android/loghandler.cpp) +endif() -include(${QT_USE_FILE}) +if(Qt5Core_FOUND) + qt5_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS}) + qt5_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS}) + qt5_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES}) +else() + qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS}) + qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS}) + qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES}) + include(${QT_USE_FILE}) +endif() #=============================================================================== #= Global Definitions @@ -259,6 +278,7 @@ include(${QT_USE_FILE}) add_definitions(${QT_DEFINITIONS}) add_definitions(-D__STDC_LIMIT_MACROS) add_definitions(-Wall -Wextra) +add_definitions(-std=c++11) if(ENABLE_DECODE) add_definitions(-DENABLE_DECODE) @@ -268,6 +288,10 @@ if(NOT DISABLE_WERROR) add_definitions(-Werror) endif() +if(ENABLE_SIGNALS) + add_definitions(-DENABLE_SIGNALS) +endif() + #=============================================================================== #= Global Include Directories #------------------------------------------------------------------------------- @@ -276,6 +300,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${Boost_INCLUDE_DIRS} + ${QT_INCLUDE_DIRS} ) if(STATIC_PKGDEPS_LIBS) @@ -292,7 +317,6 @@ link_directories(${Boost_LIBRARY_DIRS}) set(PULSEVIEW_LINK_LIBS ${Boost_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} ${QT_LIBRARIES} ) @@ -317,12 +341,25 @@ if(WIN32) list(APPEND PULSEVIEW_LINK_LIBS "-lqsvg") endif() +if(ANDROID) + list(APPEND PULSEVIEW_LINK_LIBS "-llog") +endif() + +if(ANDROID) +add_library(${PROJECT_NAME} SHARED + ${pulseview_SOURCES} + ${pulseview_HEADERS_MOC} + ${pulseview_FORMS_HEADERS} + ${pulseview_RESOURCES_RCC} +) +else() add_executable(${PROJECT_NAME} ${pulseview_SOURCES} ${pulseview_HEADERS_MOC} ${pulseview_FORMS_HEADERS} ${pulseview_RESOURCES_RCC} ) +endif() target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})