X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=40e61e22a1f2d0c1679a4f6b63e9766499424461;hp=61daa1885b61d5bfd0035e6e876a051a373b9eab;hb=1cd4be221d31680c42c4385e6861e1cf3afafa6a;hpb=95d431080479af44919a10ac317c563b39098605

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61daa188..40e61e22 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()
@@ -70,21 +67,27 @@ 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
 #-------------------------------------------------------------------------------
@@ -149,6 +152,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
@@ -188,6 +192,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
@@ -247,11 +252,16 @@ 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})
-
-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
@@ -270,6 +280,10 @@ if(NOT DISABLE_WERROR)
 	add_definitions(-Werror)
 endif()
 
+if(ENABLE_SIGNALS)
+	add_definitions(-DENABLE_SIGNALS)
+endif()
+
 #===============================================================================
 #= Global Include Directories
 #-------------------------------------------------------------------------------
@@ -278,6 +292,7 @@ include_directories(
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}
 	${Boost_INCLUDE_DIRS}
+	${QT_INCLUDE_DIRS}
 )
 
 if(STATIC_PKGDEPS_LIBS)
@@ -294,7 +309,6 @@ link_directories(${Boost_LIBRARY_DIRS})
 
 set(PULSEVIEW_LINK_LIBS
 	${Boost_LIBRARIES}
-	${CMAKE_THREAD_LIBS_INIT}
 	${QT_LIBRARIES}
 )