Commit 31dd44d6 authored by Robert Maynard's avatar Robert Maynard
Browse files

Fix qt so that we properly patch corewlan to build on osx 10.8 and 10.9

parent 756ceb30
......@@ -42,32 +42,32 @@ endif()
add_external_project_or_use_system(
qt
DEPENDS zlib ${qt_depends}
CONFIGURE_COMMAND <SOURCE_DIR>/configure
-prefix <INSTALL_DIR>
-confirm-license
-release
-no-audio-backend
-no-dbus
-nomake demos
-nomake examples
-no-multimedia
-no-openssl
-no-phonon
-no-xinerama
-no-scripttools
-no-svg
-no-declarative-debug
-no-xvideo
-opensource
-qt-libjpeg
-qt-libtiff
-system-zlib
-xmlpatterns
-I <INSTALL_DIR>/include
-L <INSTALL_DIR>/lib
${qt_options}
${qt_EXTRA_CONFIGURATION_OPTIONS}
${patch_command}
CONFIGURE_COMMAND <SOURCE_DIR>/configure
-prefix <INSTALL_DIR>
-confirm-license
-release
-no-audio-backend
-no-dbus
-nomake demos
-nomake examples
-no-multimedia
-no-openssl
-no-phonon
-no-xinerama
-no-scripttools
-no-svg
-no-declarative-debug
-no-xvideo
-opensource
-qt-libjpeg
-qt-libtiff
-system-zlib
-xmlpatterns
-I <INSTALL_DIR>/include
-L <INSTALL_DIR>/lib
${qt_options}
${qt_EXTRA_CONFIGURATION_OPTIONS}
)
if ((NOT 64bit_build) AND UNIX AND (NOT APPLE))
......@@ -86,10 +86,10 @@ if (APPLE)
# corewlan .pro file needs to be patched to find
add_external_project_step(qt-patch-corewlan
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${SuperBuild_PROJECTS_DIR}/patches/qt.src.plugins.berarer.corewlan.corewlan.pro
<SOURCE_DIR>/src/plugins/berarer/corewlan/corewlan.pro
DEPENDEES patch
DEPENDERS configure)
${SuperBuild_PROJECTS_DIR}/patches/qt.src.plugins.bearer.corewlan.corewlan.pro
<SOURCE_DIR>/src/plugins/bearer/corewlan/corewlan.pro
DEPENDEES configure
DEPENDERS build)
endif()
# Tell ParaView to disable WebKit, if disabled.
......
Supports Markdown
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