Commit a476c862 authored by Ben Boeckel's avatar Ben Boeckel

qt: disable webkit

It isn't necessary anymore in ParaView.
parent 6189b826
......@@ -7,11 +7,6 @@ if (NOT APPLE AND UNIX)
-system-libpng
-I <INSTALL_DIR>/include/freetype2
-I <INSTALL_DIR>/include/fontconfig)
# Fix Qt build failure with GCC 4.1.
set (patch_command PATCH_COMMAND
${CMAKE_COMMAND} -E copy_if_different
${SuperBuild_PROJECTS_DIR}/patches/qt.src.3rdparty.webkit.Source.WebKit.pri
<SOURCE_DIR>/src/3rdparty/webkit/Source/WebKit.pri)
elseif (APPLE)
#set the platform to be clang if on apple and not gcc
if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
......@@ -25,14 +20,6 @@ elseif (APPLE)
endif()
set(qt_EXTRA_CONFIGURATION_OPTIONS ""
CACHE STRING "Extra arguments to be passed to Qt when configuring.")
option(qt_DISABLE_WEBKIT "Disable QtWebKit." OFF)
mark_as_advanced(qt_DISABLE_WEBKIT)
if (qt_DISABLE_WEBKIT)
list (APPEND qt_options -no-webkit)
else()
list (APPEND qt_options -webkit)
endif()
add_external_project_or_use_system(
qt
......@@ -48,6 +35,7 @@ add_external_project_or_use_system(
-nomake examples
-no-multimedia
-no-openssl
-no-webkit
-no-phonon
-no-xinerama
-no-scripttools
......@@ -104,7 +92,3 @@ if (APPLE)
DEPENDEES configure
DEPENDERS build)
endif()
# Tell ParaView to disable WebKit, if disabled.
add_extra_cmake_args(
-DPQWIDGETS_DISABLE_QTWEBKIT:BOOL=${qt_DISABLE_WEBKIT})
......@@ -14,6 +14,7 @@ add_external_project_or_use_system(qt
-no-declarative-debug
-no-multimedia
-no-openssl
-no-webkit
-no-phonon
-no-script
-no-scripttools
......@@ -22,7 +23,6 @@ add_external_project_or_use_system(qt
-nomake tests
-qt-libjpeg
-qt-libtiff
-webkit
-xmlpatterns
-I <INSTALL_DIR>/include
-L <INSTALL_DIR>/lib
......
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