refine install of qt plugins

cginternals · Aug 28, 2014 · f1834d1 · f1834d1
1 parent 8df22ee
commit f1834d1
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ set(META_PROJECT_NAME        "glraw")
 set(META_PROJECT_DESCRIPTION "Converts images to OpenGL compatible raw files")
 set(META_VERSION_MAJOR       "1")
 set(META_VERSION_MINOR       "0")
-set(META_VERSION_PATCH       "1")
+set(META_VERSION_PATCH       "3")
 set(META_VERSION             "${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}")
 set(META_AUTHOR_ORGANIZATION "hpicgs group")
 set(META_AUTHOR_DOMAIN       "https://github.com/hpicgs/glraw")

diff --git a/cmake/Custom.cmake b/cmake/Custom.cmake
@@ -44,6 +44,49 @@ macro(install_qt DEST)
     foreach(target ${args})
         get_target_property(qtrelease Qt5::${target} LOCATION_RELEASE)
         install(FILES ${qtrelease} DESTINATION ${DEST})
-    endforeach()
+    endforeach() 
+
+    get_target_property(qtrelease Qt5::Core LOCATION_RELEASE)
+    get_filename_component(qtdir ${qtrelease} DIRECTORY)
+
+    install(FILES 
+        ${qtdir}/icudt52.dll
+        ${qtdir}/icuin52.dll
+        ${qtdir}/icuuc52.dll
+        DESTINATION ${DEST})
+
+endmacro()
+
+
+macro(install_qt_platforms DEST)
+
+    set(args ${ARGV})
+    list(REMOVE_AT args 0)
+
+    get_target_property(qtrelease Qt5::Core LOCATION_RELEASE)
+    get_filename_component(qtdir ${qtrelease} DIRECTORY)
+
+    foreach(target ${args})
+        install(FILES "${qtdir}/../plugins/platforms/${target}.dll" DESTINATION ${DEST}/plugins/platforms)
+    endforeach()    
+
+    install(FILES ${CMAKE_SOURCE_DIR}/packages/qt.conf DESTINATION ${DEST})
+
+endmacro()
+
+
+macro(install_qt_imageformats DEST)
+
+    set(args ${ARGV})
+    list(REMOVE_AT args 0)
+
+    get_target_property(qtrelease Qt5::Core LOCATION_RELEASE)
+    get_filename_component(qtdir ${qtrelease} DIRECTORY)
+
+    foreach(target ${args})
+        install(FILES "${qtdir}/../plugins/imageformats/${target}.dll" DESTINATION ${DEST}/plugins/imageformats)
+    endforeach()    
+
+    install(FILES ${CMAKE_SOURCE_DIR}/packages/qt.conf DESTINATION ${DEST})
 
 endmacro()
diff --git a/packages/qt.conf b/packages/qt.conf
@@ -0,0 +1,2 @@
+[Paths]
+Plugins=plugins
diff --git a/source/glraw-viewer/CMakeLists.txt b/source/glraw-viewer/CMakeLists.txt
@@ -32,7 +32,6 @@ include_directories(
 
 set(libs
     # e.g., ${TRDP_LIBRARIES}
-    ${OPENGL_LIBRARIES}
     glraw
 )
 

diff --git a/source/glraw/CMakeLists.txt b/source/glraw/CMakeLists.txt
@@ -129,6 +129,8 @@ install(TARGETS ${target}
 # deploy qt binaries (glraw debug target should not be deployed)
 if(WIN32)
     install_qt(${INSTALL_BIN} Core Gui Widgets OpenGL)
+    install_qt_platforms(${INSTALL_BIN} qwindows)
+    install_qt_imageformats(${INSTALL_BIN} qdds qgif qicns qico qjp2 qjpeg qmng qsvg qtga qtiff qwbmp qwebp)
 endif()
 
 # Header files