From 711e6fd1e52fe46b9defc70960ff29bc8429ef28 Mon Sep 17 00:00:00 2001 From: clemahieu Date: Fri, 25 Mar 2016 23:35:25 -0700 Subject: [PATCH] Selecting runtime based on bits. --- CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b80bf0c3..e09ece47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -285,7 +285,12 @@ 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'") + if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") + set (WIN_REDIST vc_redist.x64.exe) + else () + set (WIN_REDIST vc_redist.x86.exe) + endif () + set (CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\${WIN_REDIST}\\\" /quiet /norestart'") set (CPACK_NSIS_MUI_ICON ${CMAKE_SOURCE_DIR}/RaiBlocks.ico) set (CPACK_NSIS_DISPLAY_NAME "RaiBlocks") set (CPACK_NSIS_PACKAGE_NAME "RaiBlocks ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") @@ -296,7 +301,7 @@ elseif (WIN32) 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 ${CMAKE_CURRENT_BINARY_DIR}/${WIN_REDIST} 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 .)