Commits

transporter committed ee98554

Moved Qt installs from qtOgitor and qtOfs to windows install and fixes #998

Comments (0)

Files changed (3)

CMakeModules/install/windows.cmake

 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/Templates/plugins.wincfg.in ${CMAKE_INSTALL_PREFIX}/bin/plugins.cfg)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/Templates/plugins_d.wincfg.in ${CMAKE_INSTALL_PREFIX}/bin/plugins_debug.cfg)
 
+# Qt5 DLLs
+file(TO_CMAKE_PATH $ENV{QTDIR} QTDIR) 
+set(QT_DLL_DIR "${QTDIR}/bin")
+set(QT_PLUGINS_DIR "${QTDIR}/plugins")
+install(FILES
+    ${QT_DLL_DIR}/Qt5Core.dll
+    ${QT_DLL_DIR}/Qt5Gui.dll
+    ${QT_DLL_DIR}/Qt5Svg.dll
+    ${QT_DLL_DIR}/Qt5Xml.dll
+    ${QT_DLL_DIR}/Qt5Widgets.dll
+    ${QT_DLL_DIR}/Qt5XmlPatterns.dll
+	${QT_DLL_DIR}/libEGL.dll
+	${QT_DLL_DIR}/libGLESv2.dll
+	${QT_DLL_DIR}/icudt51.dll
+	${QT_DLL_DIR}/icuin51.dll
+	${QT_DLL_DIR}/icuuc51.dll
+	${QT_DLL_DIR}/assistant.exe
+	${QT_DLL_DIR}/Qt5Help.dll
+	${QT_DLL_DIR}/Qt5Network.dll
+	${QT_DLL_DIR}/Qt5Sql.dll
+	${QT_DLL_DIR}/Qt5WebKit.dll
+	${QT_DLL_DIR}/Qt5CLucene.dll
+    DESTINATION bin
+    CONFIGURATIONS Release)
+install(FILES
+    ${QT_DLL_DIR}/Qt5Cored.dll
+    ${QT_DLL_DIR}/Qt5Guid.dll
+    ${QT_DLL_DIR}/Qt5Svgd.dll
+    ${QT_DLL_DIR}/Qt5Xmld.dll
+    ${QT_DLL_DIR}/Qt5Widgetsd.dll
+    ${QT_DLL_DIR}/Qt5XmlPatternsd.dll
+	${QT_DLL_DIR}/libEGLd.dll
+	${QT_DLL_DIR}/libGLESv2d.dll
+	${QT_DLL_DIR}/icudt51.dll
+	${QT_DLL_DIR}/icuin51.dll
+	${QT_DLL_DIR}/icuuc51.dll
+	${QT_DLL_DIR}/assistant.exe
+	${QT_DLL_DIR}/Qt5Helpd.dll
+	${QT_DLL_DIR}/Qt5Networkd.dll
+	${QT_DLL_DIR}/Qt5Sqld.dll
+	${QT_DLL_DIR}/Qt5WebKitd.dll
+	${QT_DLL_DIR}/Qt5CLucened.dll
+    DESTINATION bin
+    CONFIGURATIONS Debug)
+install(FILES ${QT_PLUGINS_DIR}/iconengines/qsvgicon.dll
+    DESTINATION bin/iconengines
+    CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
+install(FILES ${QT_PLUGINS_DIR}/iconengines/qsvgicond.dll
+    DESTINATION bin/iconengines
+    CONFIGURATIONS Debug)
+install(FILES ${QT_PLUGINS_DIR}/platforms/qwindows.dll
+    DESTINATION bin/platforms
+    CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
+install(FILES ${QT_PLUGINS_DIR}/platforms/qwindowsd.dll
+    DESTINATION bin/platforms
+    CONFIGURATIONS Debug)
+install(FILES ${QT_PLUGINS_DIR}/sqldrivers/qsqlite.dll
+    DESTINATION bin/sqldrivers
+    CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
+install(FILES ${QT_PLUGINS_DIR}/sqldrivers/qsqlited.dll
+    DESTINATION bin/sqldrivers
+    CONFIGURATIONS Debug)
+
+# Runtime libraries
 IF(OGITOR_DIST)
 	if(EXISTS redist/dxwebsetup.exe)
 		install(FILES redist/dxwebsetup.exe

qtOfs/CMakeLists.txt

 	endif(UNIX)
 
 	if(WIN32)
-		set(QT_DLL_DIR "$ENV{QTDIR}/bin")
-        set(QT_PLUGINS_DIR "$ENV{QTDIR}/plugins")
-
-        install(FILES
-            ${QT_DLL_DIR}/Qt5Core.dll
-            ${QT_DLL_DIR}/Qt5Gui.dll
-            ${QT_DLL_DIR}/Qt5Svg.dll
-            ${QT_DLL_DIR}/Qt5Xml.dll
-            ${QT_DLL_DIR}/Qt5Widgets.dll
-            ${QT_DLL_DIR}/Qt5XmlPatterns.dll
-			${QT_DLL_DIR}/libEGL.dll
-			${QT_DLL_DIR}/libGLESv2.dll
-			${QT_DLL_DIR}/icudt51.dll
-			${QT_DLL_DIR}/icuin51.dll
-			${QT_DLL_DIR}/icuuc51.dll
-            DESTINATION bin
-            CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
-        install(FILES
-            ${QT_DLL_DIR}/Qt5Cored.dll
-            ${QT_DLL_DIR}/Qt5Guid.dll
-            ${QT_DLL_DIR}/Qt5Svgd.dll
-            ${QT_DLL_DIR}/Qt5Xmld.dll
-            ${QT_DLL_DIR}/Qt5Widgetsd.dll
-            ${QT_DLL_DIR}/Qt5XmlPatternsd.dll
-			${QT_DLL_DIR}/libEGLd.dll
-			${QT_DLL_DIR}/libGLESv2d.dll
-			${QT_DLL_DIR}/icudt51.dll
-			${QT_DLL_DIR}/icuin51.dll
-			${QT_DLL_DIR}/icuuc51.dll
-            DESTINATION bin
-            CONFIGURATIONS Debug)
-        install(FILES ${QT_PLUGINS_DIR}/iconengines/qsvgicon.dll
-            DESTINATION bin/iconengines
-            CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
-        install(FILES ${QT_PLUGINS_DIR}/iconengines/qsvgicond.dll
-            DESTINATION bin/iconengines
-            CONFIGURATIONS Debug)
-        install(FILES ${QT_PLUGINS_DIR}/platforms/qwindows.dll
-            DESTINATION bin/platforms
-            CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
-        install(FILES ${QT_PLUGINS_DIR}/platforms/qwindowsd.dll
-            DESTINATION bin/platforms
-            CONFIGURATIONS Debug)
-
 		install(TARGETS qtOfs
 			RUNTIME DESTINATION bin
 			CONFIGURATIONS Debug Release RelWithDebInfo MinSizeRel)

qtOgitor/CMakeLists.txt

     endif(UNIX)
 
     if(WIN32)
-		set(QT_DLL_DIR "$ENV{QTDIR}/bin")
-        set(QT_PLUGINS_DIR "$ENV{QTDIR}/plugins")
-		
         if(OGITOR_MESHMAGICK_INTERFACE)
             set_target_properties(qtOgitor PROPERTIES
                 COMPILE_DEFINITIONS "QT_QTPROPERTYBROWSER_IMPORT;OGITOR_MESHMAGICK_INTERFACE")
                 COMPILE_DEFINITIONS QT_QTPROPERTYBROWSER_IMPORT)
         endif(OGITOR_MESHMAGICK_INTERFACE)
 
-        install(FILES
-            ${QT_DLL_DIR}/Qt5Core.dll
-            ${QT_DLL_DIR}/Qt5Gui.dll
-            ${QT_DLL_DIR}/Qt5Svg.dll
-            ${QT_DLL_DIR}/Qt5Xml.dll
-            ${QT_DLL_DIR}/Qt5Widgets.dll
-            ${QT_DLL_DIR}/Qt5XmlPatterns.dll
-			${QT_DLL_DIR}/libEGL.dll
-			${QT_DLL_DIR}/libGLESv2.dll
-			${QT_DLL_DIR}/icudt51.dll
-			${QT_DLL_DIR}/icuin51.dll
-			${QT_DLL_DIR}/icuuc51.dll
-            DESTINATION bin
-            CONFIGURATIONS Release)
-        install(FILES
-            ${QT_DLL_DIR}/Qt5Cored.dll
-            ${QT_DLL_DIR}/Qt5Guid.dll
-            ${QT_DLL_DIR}/Qt5Svgd.dll
-            ${QT_DLL_DIR}/Qt5Xmld.dll
-            ${QT_DLL_DIR}/Qt5Widgetsd.dll
-            ${QT_DLL_DIR}/Qt5XmlPatternsd.dll
-			${QT_DLL_DIR}/libEGLd.dll
-			${QT_DLL_DIR}/libGLESv2d.dll
-			${QT_DLL_DIR}/icudt51.dll
-			${QT_DLL_DIR}/icuin51.dll
-			${QT_DLL_DIR}/icuuc51.dll
-            DESTINATION bin
-            CONFIGURATIONS Debug)
-        install(FILES ${QT_PLUGINS_DIR}/iconengines/qsvgicon.dll
-            DESTINATION bin/iconengines
-            CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
-        install(FILES ${QT_PLUGINS_DIR}/iconengines/qsvgicond.dll
-            DESTINATION bin/iconengines
-            CONFIGURATIONS Debug)
-        install(FILES ${QT_PLUGINS_DIR}/platforms/qwindows.dll
-            DESTINATION bin/platforms
-            CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
-        install(FILES ${QT_PLUGINS_DIR}/platforms/qwindowsd.dll
-            DESTINATION bin/platforms
-            CONFIGURATIONS Debug)
-
         install(TARGETS qtOgitor
             RUNTIME DESTINATION bin
             CONFIGURATIONS Debug Release RelWithDebInfo MinSizeRel)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.