Merge pull request #1081 from arkpar/msvc

Use windeployqt for deployment on windows

cmake/EthDependencies.cmake

@@ -128,6 +128,11 @@ if (NOT HEADLESS)
 		set (MACDEPLOYQT_APP ${Qt5Core_DIR}/../../../bin/macdeployqt)
 		message(" - macdeployqt path: ${MACDEPLOYQT_APP}")
 	endif()
+	# we need to find path to windeployqt on windows
+	if (WIN32)
+		set (WINDEPLOYQT_APP ${Qt5Core_DIR}/../../../bin/windeployqt)
+		message(" - windeployqt path: ${WINDEPLOYQT_APP}")
+	endif()
 
 # TODO check node && npm version
 	find_program(ETH_NODE node)

cmake/EthExecutableHelper.cmake

@@ -63,7 +63,7 @@ macro(eth_install_executable EXECUTABLE)
 		if (APPLE)
 			set(eth_qml_dir "-qmldir=${ETH_INSTALL_EXECUTABLE_QMLDIR}")
 		elseif (WIN32)
-			set(eth_qml_dir --qmldir ${ETH_INSTALL_EXECUTABLE_QMLDIR})
+			set(eth_qml_dir "--qmldir ${ETH_INSTALL_EXECUTABLE_QMLDIR}")
 		endif()
 		message(STATUS "${EXECUTABLE} qmldir: ${eth_qml_dir}")
 	endif()
@@ -88,49 +88,17 @@ macro(eth_install_executable EXECUTABLE)
 			set(BU_CHMOD_BUNDLE_ITEMS 1)
 			verify_app(\"${APP_BUNDLE_PATH}\")
 			" COMPONENT RUNTIME )
-	elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-
-		# copy all dlls to executable directory
-		# TODO improve that by copying only required dlls
-		file (GLOB DLLS ${ETH_DEPENDENCY_INSTALL_DIR}/bin/*.dll)
-
-		foreach(DLL ${DLLS})
-			add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
-				COMMAND cmake -E copy "${DLL}" "$<TARGET_FILE_DIR:${EXECUTABLE}>"
-			)
-		endforeach()
 
+	elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 		add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
-			COMMAND cmake -E copy_directory
+			COMMAND cmd /C "set PATH=${Qt5Core_DIR}/../../../bin;%PATH% && ${WINDEPLOYQT_APP} ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.exe ${eth_qml_dir}"
-			"${ETH_DEPENDENCY_INSTALL_DIR}/plugins/platforms"
+			WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-			$<TARGET_FILE_DIR:${EXECUTABLE}>/platforms
 		)
-
+		#workaround for https://bugreports.qt.io/browse/QTBUG-42083
-		# ugly way, improve that
 		add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
-			COMMAND cmake -E copy_directory
+			COMMAND cmd /C "(echo [Paths] & echo.Prefix=.)" > "qt.conf"
-			"${ETH_DEPENDENCY_INSTALL_DIR}/qml"
+			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} VERBATIM
-			$<TARGET_FILE_DIR:${EXECUTABLE}>
-		)
-
-		install( FILES ${DLLS} 
-			DESTINATION bin
-			COMPONENT ${EXECUTABLE}
-		)
-
-		install( DIRECTORY ${ETH_DEPENDENCY_INSTALL_DIR}/plugins/platforms 
-			DESTINATION bin
-			COMPONENT ${EXECUTABLE}
 		)
-
-		file (GLOB QMLS ${ETH_DEPENDENCY_INSTALL_DIR}/qml/*)
-		foreach(QML ${QMLS})
-			install( DIRECTORY ${QML} 
-				DESTINATION bin
-				COMPONENT ${EXECUTABLE}
-			)
-		endforeach()
-
 		install( TARGETS ${EXECUTABLE} RUNTIME 
 			DESTINATION bin
 			COMPONENT ${EXECUTABLE}