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
c16dee7b
Commit
c16dee7b
authored
Mar 19, 2015
by
Guillaume Pasero
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ENH: superbuild: qt4 on msvc uses a wrapper script to configure and build
parent
79608724
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
35 deletions
+40
-35
SuperBuild/CMake/External_qt4.cmake
SuperBuild/CMake/External_qt4.cmake
+30
-35
SuperBuild/patches/QT4/configure_qt4.bat.in
SuperBuild/patches/QT4/configure_qt4.bat.in
+10
-0
No files found.
SuperBuild/CMake/External_qt4.cmake
View file @
c16dee7b
...
...
@@ -29,42 +29,37 @@ else()
STRING
(
REGEX REPLACE
"/$"
""
CMAKE_WIN_INSTALL_PREFIX
${
SB_INSTALL_PREFIX
}
)
STRING
(
REGEX REPLACE
"/"
"
\\\\
"
CMAKE_WIN_INSTALL_PREFIX
${
CMAKE_WIN_INSTALL_PREFIX
}
)
if
(
MSVC
)
configure_file
(
${
CMAKE_SOURCE_DIR
}
/patches/
${
proj
}
/configure_qt4.bat.in
${
CMAKE_BINARY_DIR
}
/configure_qt4.bat
@ONLY
)
ExternalProject_Add
(
${
proj
}
PREFIX
${
proj
}
URL
"http://download.qt-project.org/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz"
URL_MD5 2edbe4d6c2eff33ef91732602f3518eb
BINARY_DIR
${
QT4_SB_SRC
}
INSTALL_DIR
${
SB_INSTALL_PREFIX
}
CONFIGURE_COMMAND
configure
-prefix
${
CMAKE_WIN_INSTALL_PREFIX
}
-opensource
-confirm-license
-release
-shared
-nomake demos
-nomake examples
-nomake tools
-no-phonon-backend
-no-phonon
-no-script
-no-scripttools
-no-multimedia
-no-webkit
-qt-sql-sqlite
-plugin-sql-sqlite
-no-nis
-no-qt3support
-system-zlib
-system-libpng
-system-libtiff
-system-libjpeg
#-system-sqlite
-L
${
CMAKE_WIN_INSTALL_PREFIX
}
\\lib
-I
${
CMAKE_WIN_INSTALL_PREFIX
}
\\include
DEPENDS
${${
proj
}
_DEPENDENCIES
}
)
ExternalProject_Add
(
${
proj
}
PREFIX
${
proj
}
URL
"http://download.qt-project.org/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz"
URL_MD5 2edbe4d6c2eff33ef91732602f3518eb
BINARY_DIR
${
QT4_SB_SRC
}
INSTALL_DIR
${
SB_INSTALL_PREFIX
}
CONFIGURE_COMMAND
configure_qt4.bat
PATCH_COMMAND
${
CMAKE_COMMAND
}
-E copy
${
CMAKE_BINARY_DIR
}
/configure_qt4.bat
${
QT4_SB_SRC
}
DEPENDS
${${
proj
}
_DEPENDENCIES
}
)
else
()
ExternalProject_Add
(
${
proj
}
PREFIX
${
proj
}
URL
"http://download.qt-project.org/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz"
URL_MD5 2edbe4d6c2eff33ef91732602f3518eb
BINARY_DIR
${
QT4_SB_SRC
}
INSTALL_DIR
${
SB_INSTALL_PREFIX
}
CONFIGURE_COMMAND
configure -prefix
${
CMAKE_WIN_INSTALL_PREFIX
}
-opensource -confirm-license -release -shared -nomake demos -nomake examples -nomake tools -no-phonon-backend -no-phonon -no-script -no-scripttools -no-multimedia -no-webkit -qt-sql-sqlite -plugin-sql-sqlite -no-nis -no-qt3support -system-zlib -system-libpng -system-libtiff -system-libjpeg -system-sqlite -L
${
CMAKE_WIN_INSTALL_PREFIX
}
\\lib -I
${
CMAKE_WIN_INSTALL_PREFIX
}
\\include
DEPENDS
${${
proj
}
_DEPENDENCIES
}
)
endif
()
#copying Qt4 to have out-of-source build takes too much disk space
# ExternalProject_Add_Step(${proj} copy_source
...
...
SuperBuild/patches/QT4/configure_qt4.bat.in
0 → 100755
View file @
c16dee7b
set SB_SAVE_INCLUDE=%INCLUDE%
set SB_SAVE_LIB=%LIB%
set INCLUDE=%INCLUDE%;@CMAKE_WIN_INSTALL_PREFIX@\include
set LIB=%LIB%;@CMAKE_WIN_INSTALL_PREFIX@\lib
configure -prefix @CMAKE_WIN_INSTALL_PREFIX@ -opensource -confirm-license -release -shared -nomake demos -nomake examples -nomake tools -no-phonon-backend -no-phonon -no-script -no-scripttools -no-multimedia -no-webkit -qt-sql-sqlite -plugin-sql-sqlite -no-nis -no-qt3support -system-zlib -system-libpng -system-libtiff -system-libjpeg -system-sqlite -L @CMAKE_WIN_INSTALL_PREFIX@\lib -I @CMAKE_WIN_INSTALL_PREFIX@\include
set INCLUDE=%SB_SAVE_INCLUDE%
set LIB=%SB_SAVE_LIB%
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