Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
otb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
273
Issues
273
List
Boards
Labels
Service Desk
Milestones
Merge Requests
8
Merge Requests
8
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Main Repositories
otb
Commits
4067944f
Commit
4067944f
authored
Nov 13, 2013
by
Stéphane Albert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ENH: Configured MVD2 to build and deploy (Linux, Windows) with QtSql and SQLite driver plugin.
parent
22a60c9e
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
22 additions
and
9 deletions
+22
-9
CMake/DeployQtConf.cmake
CMake/DeployQtConf.cmake
+5
-5
CMake/qt.conf.in
CMake/qt.conf.in
+2
-1
CMakeLists.txt
CMakeLists.txt
+6
-1
Code/Common/Core/CMakeLists.txt
Code/Common/Core/CMakeLists.txt
+1
-0
Packaging/MacOS/qt.conf
Packaging/MacOS/qt.conf
+1
-0
Packaging/Windows/CMakeLists.txt
Packaging/Windows/CMakeLists.txt
+5
-1
Packaging/Windows/qt.conf
Packaging/Windows/qt.conf
+2
-1
No files found.
CMake/DeployQtConf.cmake
View file @
4067944f
...
...
@@ -6,13 +6,13 @@ macro( deploy_qt_conf TARGET_NAME )
TARGET
${
TARGET_NAME
}
PRE_BUILD
COMMAND
${
CMAKE_COMMAND
}
ARGS -D QT_TRANSLATIONS_DIR:PATH=
${
QT_TRANSLATIONS_DIR
}
-D Monteverdi2_SOURCE_DIR:PATH=
${
Monteverdi2_SOURCE_DIR
}
-D TARGET_DIR:PATH=$<TARGET_FILE_DIR:
${
TARGET_NAME
}
>
-P
${
Monteverdi2_SOURCE_DIR
}
/CMake/DeployQtConfScript.cmake
ARGS -D QT_TRANSLATIONS_DIR:PATH=
${
QT_TRANSLATIONS_DIR
}
-D QT_PLUGINS_DIR:PATH=
${
QT_PLUGINS_DIR
}
-D Monteverdi2_SOURCE_DIR:PATH=
${
Monteverdi2_SOURCE_DIR
}
-D TARGET_DIR:PATH=$<TARGET_FILE_DIR:
${
TARGET_NAME
}
>
-P
${
Monteverdi2_SOURCE_DIR
}
/CMake/DeployQtConfScript.cmake
COMMENT
"Deploying qt.conf in
${
TARGET_NAME
}
build dir"
VERBATIM
)
endmacro
()
CMake/qt.conf.in
View file @
4067944f
[Paths]
Translations=@QT_TRANSLATIONS_DIR@
\ No newline at end of file
Translations=@QT_TRANSLATIONS_DIR@
Plugins=@QT_PLUGINS_DIR@
CMakeLists.txt
View file @
4067944f
...
...
@@ -58,13 +58,18 @@ find_package( OpenGL REQUIRED )
#----------------------------------------------------------------------------
# Qt4
set
(
QT_USE_IMPORTED_TARGETS ON
)
find_package
(
Qt4 REQUIRED QtCore QtGui QtOpenGL QtMain QtXml
)
find_package
(
Qt4 REQUIRED QtCore QtGui QtOpenGL QtMain Qt
Sql Qt
Xml
)
include
(
${
QT_USE_FILE
}
)
if
(
QT_FOUND
)
message
(
"Qt plugins dir: '
${
QT_PLUGINS_DIR
}
'"
)
message
(
"Qt translations dir: '
${
QT_TRANSLATIONS_DIR
}
'"
)
endif
(
QT_FOUND
)
#----------------------------------------------------------------------------
# Qwt
find_package
(
Qwt REQUIRED
)
if
(
QWT_FOUND
)
# message( ${QWT_LIBRARIES} )
if
(
WIN32
)
add_definitions
(
-DQWT_DLL
)
endif
(
WIN32
)
...
...
Code/Common/Core/CMakeLists.txt
View file @
4067944f
...
...
@@ -89,6 +89,7 @@ add_library(Monteverdi2_Core
target_link_libraries
(
Monteverdi2_Core
OTBIO
Qt4::QtCore
Qt4::QtSql
Qt4::QtXml
)
...
...
Packaging/MacOS/qt.conf
View file @
4067944f
[
Paths
]
Translations
=../../
share
/
qt4
/
translations
Packaging/Windows/CMakeLists.txt
View file @
4067944f
...
...
@@ -103,10 +103,14 @@ install(FILES ${QT_TRANSLATIONS_FILES}
DESTINATION share/qt4/translations
COMPONENT Resources
)
install
(
FILES
${
QT_PLUGINS_DIR
}
/sqldrivers/qsqlite4.dll
DESTINATION lib/qt4/plugins/sqldrivers/
COMPONENT Runtime
)
install
(
FILES qt.conf
DESTINATION bin
COMPONENT Resources
)
install
(
FILES
${
Monteverdi2_SOURCE_DIR
}
/Packaging/Windows/monteverdi2.bat
DESTINATION bin
COMPONENT Runtime
)
...
...
Packaging/Windows/qt.conf
View file @
4067944f
[
Paths
]
Translations
=../
share
/
qt4
/
translations
\ No newline at end of file
Translations
=../
share
/
qt4
/
translations
Plugins
=../
lib
/
qt4
/
plugins
\ No newline at end of file
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