Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Main Repositories
otb
Commits
48c3a5d4
Commit
48c3a5d4
authored
Apr 09, 2018
by
Guillaume Pasero
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SuperBuild: fix broken list of configure options
parent
0cd76d38
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
17 deletions
+17
-17
SuperBuild/CMake/External_qt5.cmake
SuperBuild/CMake/External_qt5.cmake
+17
-17
No files found.
SuperBuild/CMake/External_qt5.cmake
View file @
48c3a5d4
...
...
@@ -59,7 +59,7 @@ set(QT5_SB_CONFIG
-skip qtgamepad \
-skip qt3d \
-skip qtactiveqt \
-skip qtandroidextras
\
-skip qtandroidextras \
-skip qtcanvas3d \
-skip qtcharts \
-skip qtconnectivity \
...
...
@@ -117,22 +117,22 @@ set(QT5_SB_CONFIG
# set(QT4_SB_CONFIG "${QT4_SB_CONFIG} -I ${PNG_PNG_INCLUDE_DIR}")
# endif()
#
if(UNIX)
#
if(APPLE)
#
set(QT
4
_SB_CONFIG "${QT
4
_SB_CONFIG} -no-framework")
#
else() #Linux
#
if(QT
4
_SB_ENABLE_GTK)
#
message(WARNING "QT
4
_SB_ENABLE_GTK support is experimental")
#
set(QT
4
_SB_CONFIG "${QT
4
_SB_CONFIG} -sm -xrender -xrandr -gtkstyle")
#
else()
#
set(QT
4
_SB_CONFIG "${QT
4
_SB_CONFIG} -no-gtkstyle -no-glib -no-fontconfig")
#
endif()
#
endif()
#
#common for all unix
#
set(QT
4
_SB_CONFIG "${QT
4
_SB_CONFIG} -no-dbus -no-nis -no-javascript-jit -no-icu -v")
#
elseif(MSVC)
#
set(QT
4
_SB_CONFIG "${QT
4
_SB_CONFIG} -mp")
#
endif()
if
(
UNIX
)
if
(
APPLE
)
set
(
QT
5
_SB_CONFIG
"
${
QT
5
_SB_CONFIG
}
-no-framework"
)
else
()
#Linux
# if(QT
5
_SB_ENABLE_GTK)
# message(WARNING "QT
5
_SB_ENABLE_GTK support is experimental")
# set(QT
5
_SB_CONFIG "${QT
5
_SB_CONFIG} -sm -xrender -xrandr -gtkstyle")
# else()
set
(
QT
5
_SB_CONFIG
"
${
QT
5
_SB_CONFIG
}
-no-gtkstyle -no-glib -no-fontconfig"
)
# endif()
endif
()
#common for all unix
set
(
QT
5
_SB_CONFIG
"
${
QT
5
_SB_CONFIG
}
-no-dbus -no-nis -no-javascript-jit -no-icu -v"
)
elseif
(
MSVC
)
set
(
QT
5
_SB_CONFIG
"
${
QT
5
_SB_CONFIG
}
-mp"
)
endif
()
if
(
WIN32
)
set
(
QT5_BIN_EXT
".exe"
)
...
...
Write
Preview
Markdown
is supported
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