From 2b4dc3a6fbfd2bd84ba08ca6c56979c9cf043197 Mon Sep 17 00:00:00 2001 From: Colin LeMahieu Date: Mon, 15 Feb 2016 19:21:38 -0600 Subject: [PATCH] Remove msys dlls, add vcredist and add NSIS post install command. --- CMakeLists.txt | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4500d7b3..3f469206 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -272,29 +272,17 @@ if (APPLE) install (FILES "${CMAKE_CURRENT_BINARY_DIR}/packaging/libqcocoa.dylib" DESTINATION RaiBlocks.app/Contents/PlugIns/platforms PERMISSIONS OWNER_EXECUTE OWNER_READ) install (FILES RaiBlocks.icns DESTINATION RaiBlocks.app/Contents/Resources) elseif (WIN32) + set (CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\vc_redist.x64.exe\\\" /quiet /norestart'") get_target_property (Qt5WindowsPlugin Qt5::QWindowsIntegrationPlugin LOCATION) get_filename_component (Qt5_bin_DIR ${Qt5_DIR}/../../../bin ABSOLUTE) install (TARGETS rai_wallet DESTINATION .) + install (FILES ${CMAKE_CURRENT_BINARY_DIR}/vc_redist.x64.exe DESTINATION .) + install (FILES ${Qt5_bin_DIR}/libGLESv2.dll DESTINATION .) install (FILES ${Qt5_bin_DIR}/Qt5Core.dll DESTINATION .) install (FILES ${Qt5_bin_DIR}/Qt5Gui.dll DESTINATION .) install (FILES ${Qt5_bin_DIR}/Qt5Widgets.dll DESTINATION .) install (FILES ${Qt5_bin_DIR}/Qt5WinExtras.dll DESTINATION .) install (FILES ${Qt5WindowsPlugin} DESTINATION platforms) - install (FILES "../../../mingw64/bin/libwinpthread-1.dll" DESTINATION .) - install (FILES "../../../mingw64/bin/libstdc++-6.dll" DESTINATION .) - install (FILES "../../../mingw64/bin/libgcc_s_seh-1.dll" DESTINATION .) - install (FILES "../../../mingw64/bin/libicuin55.dll" DESTINATION .) - install (FILES "../../../mingw64/bin/libicuuc55.dll" DESTINATION .) - install (FILES "../../../mingw64/bin/libpcre16-0.dll" DESTINATION .) - install (FILES "../../../mingw64/bin/zlib1.dll" DESTINATION .) - install (FILES "../../../mingw64/bin/libharfbuzz-0.dll" DESTINATION .) - install (FILES "../../../mingw64/bin/libpng16-16.dll" DESTINATION .) - install (FILES "../../../mingw64/bin/libicudt55.dll" DESTINATION .) - install (FILES "../../../mingw64/bin/libfreetype-6.dll" DESTINATION .) - install (FILES "../../../mingw64/bin/libglib-2.0-0.dll" DESTINATION .) - install (FILES "../../../mingw64/bin/libbz2-1.dll" DESTINATION .) - install (FILES "../../../mingw64/bin/libintl-8.dll" DESTINATION .) - install (FILES "../../../mingw64/bin/libiconv-2.dll" DESTINATION .) else () install (TARGETS rai_wallet DESTINATION .) endif ()