Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
David Thompson
CMB-SuperBuild
Commits
31dd44d6
Commit
31dd44d6
authored
Mar 19, 2014
by
Robert Maynard
Browse files
Fix qt so that we properly patch corewlan to build on osx 10.8 and 10.9
parent
756ceb30
Changes
2
Hide whitespace changes
Inline
Side-by-side
Projects/patches/qt.src.plugins.be
r
arer.corewlan.corewlan.pro
→
Projects/patches/qt.src.plugins.bearer.corewlan.corewlan.pro
View file @
31dd44d6
File moved
Projects/qt.cmake
View file @
31dd44d6
...
...
@@ -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.be
r
arer.corewlan.corewlan.pro
<SOURCE_DIR>/src/plugins/be
r
arer/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.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment