diff --git a/CMake/DeployQtConf.cmake b/CMake/DeployQtConf.cmake index c0f2d43615900826aba24abbbc70bedd654cbdd7..5c52eb25d0075923aa9b4739a36c56729760687e 100644 --- a/CMake/DeployQtConf.cmake +++ b/CMake/DeployQtConf.cmake @@ -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() - diff --git a/CMake/qt.conf.in b/CMake/qt.conf.in index fd4eb417b9a0814bc7306f5022d9c3bd7b1cf252..4f62e272ce98895c871f6fdea6fe4f55f7ff0563 100644 --- a/CMake/qt.conf.in +++ b/CMake/qt.conf.in @@ -1,2 +1,3 @@ [Paths] -Translations=@QT_TRANSLATIONS_DIR@ \ No newline at end of file +Translations=@QT_TRANSLATIONS_DIR@ +Plugins=@QT_PLUGINS_DIR@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 23eced711b2fa789cf0298cd5f000e43aa8d1392..7ede8ed39a6c2d6fc625e17d0a9294c27d3f1410 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 QtSql QtXml ) 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) diff --git a/Code/Common/Core/CMakeLists.txt b/Code/Common/Core/CMakeLists.txt index 0b288ce321c8df82032cf2baa0c5ae731ed4f668..c600895c88d758c386ac4cab0f4ec6fa50248808 100644 --- a/Code/Common/Core/CMakeLists.txt +++ b/Code/Common/Core/CMakeLists.txt @@ -89,6 +89,7 @@ add_library(Monteverdi2_Core target_link_libraries(Monteverdi2_Core OTBIO Qt4::QtCore + Qt4::QtSql Qt4::QtXml ) diff --git a/Packaging/MacOS/qt.conf b/Packaging/MacOS/qt.conf index e461e8d6386cf1ee4d5f47d7f3c0c7bce3f06029..f79f997dd94d74c1476b038d138ffa0a204327c5 100644 --- a/Packaging/MacOS/qt.conf +++ b/Packaging/MacOS/qt.conf @@ -1,2 +1,3 @@ [Paths] Translations=../../share/qt4/translations + diff --git a/Packaging/Windows/CMakeLists.txt b/Packaging/Windows/CMakeLists.txt index c22fbb00155ccd39fce64319823081c3b58e2a6a..470afe6ec12f6be740af2d5e542a73798b15439f 100644 --- a/Packaging/Windows/CMakeLists.txt +++ b/Packaging/Windows/CMakeLists.txt @@ -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) diff --git a/Packaging/Windows/qt.conf b/Packaging/Windows/qt.conf index e6d32af752f31135a661e21a1a4a3949b77a9979..b8c5e712b0157a81ba6494e62ada2e6201bd4951 100644 --- a/Packaging/Windows/qt.conf +++ b/Packaging/Windows/qt.conf @@ -1,2 +1,3 @@ [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