Skip to content
Snippets Groups Projects
Commit 48c3a5d4 authored by Guillaume Pasero's avatar Guillaume Pasero
Browse files

SuperBuild: fix broken list of configure options

parent 0cd76d38
No related branches found
No related tags found
No related merge requests found
...@@ -59,7 +59,7 @@ set(QT5_SB_CONFIG ...@@ -59,7 +59,7 @@ set(QT5_SB_CONFIG
-skip qtgamepad \ -skip qtgamepad \
-skip qt3d \ -skip qt3d \
-skip qtactiveqt \ -skip qtactiveqt \
-skip qtandroidextras \ -skip qtandroidextras \
-skip qtcanvas3d \ -skip qtcanvas3d \
-skip qtcharts \ -skip qtcharts \
-skip qtconnectivity \ -skip qtconnectivity \
...@@ -117,22 +117,22 @@ set(QT5_SB_CONFIG ...@@ -117,22 +117,22 @@ set(QT5_SB_CONFIG
# set(QT4_SB_CONFIG "${QT4_SB_CONFIG} -I ${PNG_PNG_INCLUDE_DIR}") # set(QT4_SB_CONFIG "${QT4_SB_CONFIG} -I ${PNG_PNG_INCLUDE_DIR}")
# endif() # endif()
# if(UNIX) if(UNIX)
# if(APPLE) if(APPLE)
# set(QT4_SB_CONFIG "${QT4_SB_CONFIG} -no-framework") set(QT5_SB_CONFIG "${QT5_SB_CONFIG} -no-framework")
# else() #Linux else() #Linux
# if(QT4_SB_ENABLE_GTK) # if(QT5_SB_ENABLE_GTK)
# message(WARNING "QT4_SB_ENABLE_GTK support is experimental") # message(WARNING "QT5_SB_ENABLE_GTK support is experimental")
# set(QT4_SB_CONFIG "${QT4_SB_CONFIG} -sm -xrender -xrandr -gtkstyle") # set(QT5_SB_CONFIG "${QT5_SB_CONFIG} -sm -xrender -xrandr -gtkstyle")
# else() # else()
# set(QT4_SB_CONFIG "${QT4_SB_CONFIG} -no-gtkstyle -no-glib -no-fontconfig") set(QT5_SB_CONFIG "${QT5_SB_CONFIG} -no-gtkstyle -no-glib -no-fontconfig")
# endif() # endif()
# endif() endif()
# #common for all unix #common for all unix
# set(QT4_SB_CONFIG "${QT4_SB_CONFIG} -no-dbus -no-nis -no-javascript-jit -no-icu -v") set(QT5_SB_CONFIG "${QT5_SB_CONFIG} -no-dbus -no-nis -no-javascript-jit -no-icu -v")
# elseif(MSVC) elseif(MSVC)
# set(QT4_SB_CONFIG "${QT4_SB_CONFIG} -mp") set(QT5_SB_CONFIG "${QT5_SB_CONFIG} -mp")
# endif() endif()
if(WIN32) if(WIN32)
set(QT5_BIN_EXT ".exe") set(QT5_BIN_EXT ".exe")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment