Ensure correct Debug vs Release configuration Qt5 dlls are installed

menggang20 · May 3, 2016 · 0d42664 · 0d42664
1 parent 159cc27
commit 0d42664
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -317,12 +317,26 @@ endif(UNIX AND NOT APPLE)
 
 if(WIN32 AND MSVC)
 	set(QT5_BIN_PATH ${QT5_PATH}/bin)
+	# The Qt5 Debug configuration library files have a 'd' postfix
+	install(FILES
+			${QT5_BIN_PATH}/Qt5Cored.dll
+			${QT5_BIN_PATH}/Qt5Guid.dll
+			${QT5_BIN_PATH}/Qt5Networkd.dll
+			${QT5_BIN_PATH}/Qt5PrintSupportd.dll
+			${QT5_BIN_PATH}/Qt5Widgetsd.dll
+		DESTINATION bin
+		CONFIGURATIONS Debug)
+	# The Qt5 Release configuration files don't have a postfix
 	install(FILES
 			${QT5_BIN_PATH}/Qt5Core.dll
 			${QT5_BIN_PATH}/Qt5Gui.dll
 			${QT5_BIN_PATH}/Qt5Network.dll
 			${QT5_BIN_PATH}/Qt5PrintSupport.dll
 			${QT5_BIN_PATH}/Qt5Widgets.dll
+		DESTINATION bin
+		CONFIGURATIONS Release)
+	# The files below are common to all configurations
+	install(FILES
 			${QT5_BIN_PATH}/icudt54.dll
 			${QT5_BIN_PATH}/icuin54.dll
 			${QT5_BIN_PATH}/icuuc54.dll
@@ -333,8 +347,8 @@ if(WIN32 AND MSVC)
 	install(FILES
 		${QT5_PATH}/plugins/platforms/qwindows.dll
 		DESTINATION bin/platforms)
-
-	install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/deps/${VSREDIST} DESTINATION tmp)
+	install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/deps/${VSREDIST}
+		DESTINATION tmp)
 endif()
 
 #cpack