Commit 46f85400 authored by Guillaume Pasero's avatar Guillaume Pasero

Merge branch 'fix_1687_qt5_superbuild' into 'develop'

BUG: fix qt5 compilation on ubuntu 18.04

See merge request !234
parents af7abaa7 49858e3b
......@@ -22,17 +22,6 @@ INCLUDE_ONCE_MACRO(QT5)
SETUP_SUPERBUILD(QT5)
#RK: are we ready for QT4 build on linux?.
#This comment here scares me away.
#Installing QT4 from packages also need sqlite otherwise there is issue
# if(UNIX AND NOT APPLE)
# message(STATUS " SuperBuild may fail to compile Qt4. If so, you should install it via package manager.")
# endif()
#set(QT4_SB_ENABLE_GTK OFF CACHE INTERNAL "Enable GTK+ style with qt using -gtkstlye. Default is OFF")
#NOTE: make sure your superbuild install directory does not contain any
#Qt files from previous install of superbuild QT.
# declare dependencies
......@@ -102,30 +91,14 @@ set(QT5_SB_CONFIG
-skip qtwinextras \
-skip qtx11extras \
-skip qtxmlpatterns \
-system-libpng -system-libjpeg -system-zlib -system-freetype")
# "-prefix ${QT4_INSTALL_PREFIX_NATIVE} -L ${QT4_LIB_PREFIX_NATIVE} \
# -I ${QT4_INCLUDE_PREFIX_NATIVE} -I ${QT4_INCLUDE_FREETYPE_NATIVE} \
# -opensource -confirm-license -release -shared -nomake demos \
# -nomake examples -nomake tools -no-phonon-backend -no-phonon -no-script \
# -no-scripttools -no-multimedia -no-audio-backend -no-webkit -no-declarative \
# -no-accessibility -no-qt3support -no-xmlpatterns -no-sql-sqlite -no-openssl \
# -no-libtiff -no-libmng -system-libpng -system-libjpeg -system-zlib")
#RK: building faling on mac. png include is in a macframework
# if(USE_SYSTEM_PNG)
# set(QT4_SB_CONFIG "${QT4_SB_CONFIG} -I ${PNG_PNG_INCLUDE_DIR}")
# endif()
-system-libpng -system-libjpeg -system-zlib -system-freetype -qt-harfbuzz")
if(UNIX)
if(APPLE)
set(QT5_SB_CONFIG "${QT5_SB_CONFIG} -no-framework")
else() #Linux
# if(QT5_SB_ENABLE_GTK)
# message(WARNING "QT5_SB_ENABLE_GTK support is experimental")
# set(QT5_SB_CONFIG "${QT5_SB_CONFIG} -sm -xrender -xrandr -gtkstyle")
# else()
else()
#Linux
set(QT5_SB_CONFIG "${QT5_SB_CONFIG} -no-glib -no-fontconfig")
# endif()
endif()
#common for all unix
set(QT5_SB_CONFIG "${QT5_SB_CONFIG} -no-dbus -no-icu -v")
......@@ -151,52 +124,20 @@ endif()
configure_file( ${QT5_CONFIGURE_COMMAND_IN} ${QT5_CONFIGURE_COMMAND} @ONLY )
#Remove left over or previous installation from install prefix.
#Existing files in install prefix was disturbing a second installation.
#even after the QT4 directory is removed from build
# add_custom_target(QT4-uninstall
# COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtCore"
# COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtDBus"
# COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtGui"
# COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtNetwork"
# COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtOpenGL"
# COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtSql"
# COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtSvg"
# COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtTest"
# COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtXml"
# COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/Qt"
# COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/mkspecs"
# COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/plugins"
# COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/translations"
# COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/lib/libQt*"
# COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/lib/pkgconfig/Qt*"
# COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/qmake${QT4_BIN_EXT}"
# COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/lrelease${QT4_BIN_EXT}"
# COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/moc${QT4_BIN_EXT}"
# COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/rcc${QT4_BIN_EXT}"
# COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/uic${QT4_BIN_EXT}"
# COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/libQt*"
# WORKING_DIRECTORY "${SB_INSTALL_PREFIX}"
# )
#adding it to dependencies will remove the files when configure QWT
#list(APPEND QT4_DEPENDENCIES QT4-uninstall)
ExternalProject_Add(QT5
PREFIX QT5
URL "http://download.qt.io/official_releases/qt/5.10/5.10.1/single/qt-everywhere-src-5.10.1.tar.xz"
URL_MD5 7e167b9617e7bd64012daaacb85477af
BINARY_DIR ${QT5_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
CONFIGURE_COMMAND ${QT5_CONFIGURE_COMMAND}
DEPENDS ${QT5_DEPENDENCIES}
LOG_DOWNLOAD 1
LOG_CONFIGURE 1
LOG_BUILD 1
LOG_INSTALL 1
)
ExternalProject_Add(QT5
PREFIX QT5
URL "http://download.qt.io/official_releases/qt/5.10/5.10.1/single/qt-everywhere-src-5.10.1.tar.xz"
URL_MD5 7e167b9617e7bd64012daaacb85477af
BINARY_DIR ${QT5_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
CONFIGURE_COMMAND ${QT5_CONFIGURE_COMMAND}
DEPENDS ${QT5_DEPENDENCIES}
LOG_DOWNLOAD 1
LOG_CONFIGURE 1
LOG_BUILD 1
LOG_INSTALL 1
)
SUPERBUILD_PATCH_SOURCE(QT5)
......@@ -204,11 +145,11 @@ set(_SB_QT_QMAKE_EXECUTABLE ${SB_INSTALL_PREFIX}/bin/qmake)
if(UNIX AND NOT APPLE)
ExternalProject_Add_Step(QT5 adding_font
COMMAND ${CMAKE_COMMAND}
-D BUILD_DIR=${QT5_SB_BUILD_DIR}
-D INSTALL_DIR=${SB_INSTALL_PREFIX}
-D DOWNLOAD_LOCATION=${DOWNLOAD_LOCATION}
-P ${CMAKE_SOURCE_DIR}/CMake/External_font.cmake
COMMAND ${CMAKE_COMMAND}
-D BUILD_DIR=${QT5_SB_BUILD_DIR}
-D INSTALL_DIR=${SB_INSTALL_PREFIX}
-D DOWNLOAD_LOCATION=${DOWNLOAD_LOCATION}
-P ${CMAKE_SOURCE_DIR}/CMake/External_font.cmake
DEPENDEES install
WORKING_DIRECTORY ${SB_INSTALL_PREFIX} )
endif()
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