X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=d85948c095afbd7713709f0705c5f334a8dddb66;hp=a6c0445b53afb457edfb724de8bdbc3a06dc746e;hb=2b334bb4078d6e74e8ed4e3460c6596344dd9c8d;hpb=84a0d458a4b04141dd45af6dec44d36782ee163e

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a6c0445b..d85948c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,6 +37,7 @@ 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.
@@ -63,11 +64,31 @@ 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)
+if(FORCE_QT4)
+	set(Qt5Core_FOUND FALSE)
+else()
+	find_package(Qt5Core QUIET)
+endif()
+
+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_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac)
+	find_package(Qt4 REQUIRED)
+endif()
 
 find_package(Boost 1.42 COMPONENTS filesystem system REQUIRED)
 
@@ -117,13 +138,12 @@ set(pulseview_SOURCES
 	pv/device/device.cpp
 	pv/device/file.cpp
 	pv/device/devinst.cpp
-	pv/device/inputfile.cpp
 	pv/device/sessionfile.cpp
 	pv/dialogs/about.cpp
 	pv/dialogs/connect.cpp
 	pv/dialogs/storeprogress.cpp
 	pv/popups/deviceoptions.cpp
-	pv/popups/probes.cpp
+	pv/popups/channels.cpp
 	pv/prop/bool.cpp
 	pv/prop/double.cpp
 	pv/prop/enum.cpp
@@ -165,7 +185,7 @@ set(pulseview_HEADERS
 	pv/dialogs/about.h
 	pv/dialogs/connect.h
 	pv/dialogs/storeprogress.h
-	pv/popups/probes.h
+	pv/popups/channels.h
 	pv/popups/deviceoptions.h
 	pv/prop/bool.h
 	pv/prop/double.h
@@ -235,17 +255,26 @@ 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
 #-------------------------------------------------------------------------------
 
-add_definitions(${QT_DEFINITIONS})
+add_definitions(${QT_DEFINITIONS} -DQT_NO_KEYWORDS)
 add_definitions(-D__STDC_LIMIT_MACROS)
 add_definitions(-Wall -Wextra)
 add_definitions(-std=c++11)
@@ -258,6 +287,10 @@ if(NOT DISABLE_WERROR)
 	add_definitions(-Werror)
 endif()
 
+if(ENABLE_SIGNALS)
+	add_definitions(-DENABLE_SIGNALS)
+endif()
+
 #===============================================================================
 #= Global Include Directories
 #-------------------------------------------------------------------------------
@@ -266,6 +299,7 @@ include_directories(
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}
 	${Boost_INCLUDE_DIRS}
+	${QT_INCLUDE_DIRS}
 )
 
 if(STATIC_PKGDEPS_LIBS)
@@ -306,12 +340,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})