Commit 676fc429 authored by Nicolas Vuaille's avatar Nicolas Vuaille Committed by Nick Laurenson
Browse files

Bump pythonqt to patched-8 and improve qt5 support

 * Use qt version from common-superbuild
 * Drop qt4 support
 * Build qt5 in sources
Fix compilation for pythonqt patched-8: some qt private files are not found.
parent 55349122
......@@ -43,6 +43,7 @@ function (superbuild_find_projects var)
# Some of these allow using system libraries.
set(projects
boost
bzip2
cxx11
eigen
liblas
......@@ -52,8 +53,6 @@ function (superbuild_find_projects var)
png
python
pythonqt
qt
qt4
qt5
veloview
veloview.bundle
......@@ -93,6 +92,21 @@ if (WIN32)
endif()
endif()
# skiped module as defined in paraview superbuild.
# One difference: pythonQt needs Multimedia so we don't skip it.
set(qt5_skip_modules
qtconnectivity
qtgamepad
qtlocation
qtsensors
qtserialport
qtwayland
qtwebchannel
qtwebengine
qtwebsockets)
list(APPEND qt5_process_environment
BUILD_IN_SOURCE 1)
set(boost_libraries
chrono
date_time
......
superbuild_add_project(paraview
DEPENDS qt python pythonqt
DEPENDS qt5 python pythonqt
DEFAULT_ON
DEBUGGABLE
CMAKE_ARGS
......
superbuild_add_project(pythonqt
DEPENDS qt python
DEPENDS qt5 python
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=ON
-DPythonQt_QT_VERSION:STRING=${qt_version}
......
superbuild_add_project(veloview
DEPENDS paraview qt pcap boost eigen liblas
DEPENDS paraview qt5 pcap boost eigen liblas
DEFAULT_ON
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=ON
......
common-superbuild @ 72919d50
Subproject commit 076d970d6ecca041201813fc367549c2920915cc
Subproject commit 72919d504cc91a5afb5408aec58780d9b85f4eca
......@@ -8,18 +8,9 @@
# ..
# endif()
superbuild_set_customizable_revision(qt4
URL "http://download.qt-project.org/archive/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz"
URL_MD5 2edbe4d6c2eff33ef91732602f3518eb)
superbuild_set_customizable_revision(qt5
URL "http://download.qt.io/archive/qt/5.6/5.6.2/single/qt-everywhere-opensource-src-5.6.2.tar.gz"
URL_MD5 1b1b1f929d0cd83680354a0c83d8e945)
superbuild_set_revision(pythonqt
GIT_REPOSITORY git://github.com/commontk/PythonQt.git
GIT_TAG patched-5)
GIT_TAG patched-8)
set(PARAVIEW_VERSION 5.4)
superbuild_set_revision(paraview
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment