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
0fbabdfd
Commit
0fbabdfd
authored
Apr 06, 2018
by
Antoine Regimbeau
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SuperBuild: adding option to config command
parent
ed922b14
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
73 additions
and
19 deletions
+73
-19
SuperBuild/CMake/External_qt5.cmake
SuperBuild/CMake/External_qt5.cmake
+72
-19
SuperBuild/patches/QT5/configure_qt5.sh.in
SuperBuild/patches/QT5/configure_qt5.sh.in
+1
-0
No files found.
SuperBuild/CMake/External_qt5.cmake
View file @
0fbabdfd
...
...
@@ -36,19 +36,72 @@ SETUP_SUPERBUILD(QT5)
#NOTE: make sure your superbuild install directory does not contain any
#Qt files from previous install of superbuild QT.
# declare dependencies
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM
(
QT5 FREETYPE
)
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM
(
QT5
ZLIB PNG JPEG
FREETYPE
)
#use system libs always for Qt4 as we build them from source or have already in system
#
if(SB_INSTALL_PREFIX)
#
file(TO_NATIVE_PATH ${SB_INSTALL_PREFIX} QT
4
_INSTALL_PREFIX_NATIVE)
#
file(TO_NATIVE_PATH ${SB_INSTALL_PREFIX}/include QT
4
_INCLUDE_PREFIX_NATIVE)
#
file(TO_NATIVE_PATH ${SB_INSTALL_PREFIX}/lib QT
4
_LIB_PREFIX_NATIVE)
#
file(TO_NATIVE_PATH ${SB_INSTALL_PREFIX}/include/freetype2 QT
4
_INCLUDE_FREETYPE_NATIVE)
#
endif()
if
(
SB_INSTALL_PREFIX
)
file
(
TO_NATIVE_PATH
${
SB_INSTALL_PREFIX
}
QT
5
_INSTALL_PREFIX_NATIVE
)
file
(
TO_NATIVE_PATH
${
SB_INSTALL_PREFIX
}
/include QT
5
_INCLUDE_PREFIX_NATIVE
)
file
(
TO_NATIVE_PATH
${
SB_INSTALL_PREFIX
}
/lib QT
5
_LIB_PREFIX_NATIVE
)
file
(
TO_NATIVE_PATH
${
SB_INSTALL_PREFIX
}
/include/freetype2 QT
5
_INCLUDE_FREETYPE_NATIVE
)
endif
()
#Common options for all cases
# set(QT4_SB_CONFIG
# -skip qtbase
set
(
QT5_SB_CONFIG
"-prefix
${
QT5_INSTALL_PREFIX_NATIVE
}
-L
${
QT4_LIB_PREFIX_NATIVE
}
\
-I
${
QT4_INCLUDE_PREFIX_NATIVE
}
-I
${
QT4_INCLUDE_FREETYPE_NATIVE
}
\
-opensource -confirm-license -release -shared -nomake demos \
-nomake examples -nomake tools -no-openssl \
-skip qtgamepad \
-skip qt3d \
-skip qtactiveqt \
-skip qtandroidextras
\
-skip qtcanvas3d \
-skip qtcharts \
-skip qtconnectivity \
-skip qtdatavis3d \
-skip qtdeclarative \
-skip qtdoc \
-skip qtgamepad \
-skip qtgraphicaleffects \
-skip qtimageformats \
-skip qtlocation \
-skip qtmacextras \
-skip qtmultimedia \
-skip qtnetworkauth \
-skip qtpurchasing \
-skip qtquickcontrols \
-skip qtquickcontrols2 \
-skip qtremoteobjects \
-skip qtscript \
-skip qtsensors \
-skip qtserialbus \
-skip qtserialport \
-skip qtspeech hasing \
-skip qtquickcontrols \
-skip qtquickcontrols2 \
-skip qtremoteobjects \
-skip qtscript \
-skip qtsensors \
-skip qtserialbus \
-skip qtserialport \
-skip qtspeech \
-skip qtsvg \
-skip qttools \
-skip qttranslations \
-skip qtvirtualkeyboard \
-skip qtwayland \
-skip qtwebchannel \
-skip qtwebengine \
-skip qtwebglplugin \
-skip qtwebsockets \
-skip qtwebview \
-skip qtwinextras \
-skip qtx11extras \
-skip qtxmlpatterns \
-system-libpng -system-libjpeg -system-zlib"
)
# "-prefix ${QT4_INSTALL_PREFIX_NATIVE} -L ${QT4_LIB_PREFIX_NATIVE} \
# -I ${QT4_INCLUDE_PREFIX_NATIVE} -I ${QT4_INCLUDE_FREETYPE_NATIVE} \
# -opensource -confirm-license -release -shared -nomake demos \
...
...
@@ -80,22 +133,22 @@ ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(QT5 FREETYPE)
# endif()
# if(WIN32)
# set(QT
4
_BIN_EXT ".exe")
# file(TO_NATIVE_PATH ${QT
4
_SB_SRC}/configure.exe QT
4
_CONFIGURE_SCRIPT)
# set(QT
4
_CONFIGURE_COMMAND ${CMAKE_BINARY_DIR}/configure_qt
4
.bat)
# set(QT
4
_CONFIGURE_COMMAND_IN ${CMAKE_SOURCE_DIR}/patches/QT
4
/configure_qt
4
.bat.in)
# set(QT
5
_BIN_EXT ".exe")
# file(TO_NATIVE_PATH ${QT
5
_SB_SRC}/configure.exe QT
5
_CONFIGURE_SCRIPT)
# set(QT
5
_CONFIGURE_COMMAND ${CMAKE_BINARY_DIR}/configure_qt
5
.bat)
# set(QT
5
_CONFIGURE_COMMAND_IN ${CMAKE_SOURCE_DIR}/patches/QT
5
/configure_qt
5
.bat.in)
# else()
#
set(QT
4
_BIN_EXT "")
#
file(TO_NATIVE_PATH ${QT
4
_SB_SRC}/configure QT
4
_CONFIGURE_SCRIPT)
#
set(QT
4
_CONFIGURE_COMMAND ${CMAKE_BINARY_DIR}/configure_qt
4
.sh)
#
set(QT
4
_CONFIGURE_COMMAND_IN ${CMAKE_SOURCE_DIR}/patches/QT
4
/configure_qt
4
.sh.in)
set
(
QT
5
_BIN_EXT
""
)
file
(
TO_NATIVE_PATH
${
QT
5
_SB_SRC
}
/configure QT
5
_CONFIGURE_SCRIPT
)
set
(
QT
5
_CONFIGURE_COMMAND
${
CMAKE_BINARY_DIR
}
/configure_qt
5
.sh
)
set
(
QT
5
_CONFIGURE_COMMAND_IN
${
CMAKE_SOURCE_DIR
}
/patches/QT
5
/configure_qt
5
.sh.in
)
# endif()
# if(EXISTS "${QT
4
_CONFIGURE_COMMAND}")
# execute_process(COMMAND ${CMAKE_COMMAND} -E remove -f "${QT
4
_CONFIGURE_COMMAND}")
# if(EXISTS "${QT
5
_CONFIGURE_COMMAND}")
# execute_process(COMMAND ${CMAKE_COMMAND} -E remove -f "${QT
5
_CONFIGURE_COMMAND}")
# endif()
#
configure_file(${QT
4
_CONFIGURE_COMMAND_IN} ${QT
4
_CONFIGURE_COMMAND} @ONLY )
configure_file
(
${
QT
5
_CONFIGURE_COMMAND_IN
}
${
QT
5
_CONFIGURE_COMMAND
}
@ONLY
)
#Remove left over or previous installation from install prefix.
#Existing files in install prefix was disturbing a second installation.
...
...
SuperBuild/patches/QT5/configure_qt5.sh.in
0 → 100644
View file @
0fbabdfd
@QT5_CONFIGURE_SCRIPT@ @QT5_SB_CONFIG@
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