Skip to content

Commit d99d83f

Browse files
committed
windows installer will now also silently install the vc redist package
1 parent bedb1b0 commit d99d83f

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

CMakeLists.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ if(WIN32 AND MSVC)
1515
set(QT5_PATH "E:/Qt64/Qt5.4.1/5.4/msvc2013_64")
1616
set(SQLITE3_PATH "E:/libs/sqlite3_x64")
1717
set(OPENSSL_PATH "E:/libs/openssl-1.0.2a-x64_86-win64")
18+
set(VSREDIST "vcredist_x64.exe")
1819
else()
1920
set(QT5_PATH "E:/Qt/Qt5.4.1/5.4/msvc2013")
2021
set(SQLITE3_PATH "E:/libs/sqlite3")
2122
set(OPENSSL_PATH "E:/libs/openssl-1.0.2a-i386-win32")
23+
set(VSREDIST "vcredist_x86.exe")
2224
endif()
2325
set(USE_QT5 TRUE)
2426
set(CMAKE_PREFIX_PATH "${QT5_PATH};${SQLITE3_PATH}")
@@ -321,6 +323,8 @@ if(WIN32 AND MSVC)
321323
install(FILES
322324
${QT5_PATH}/plugins/platforms/qwindows.dll
323325
DESTINATION bin/platforms)
326+
327+
install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/deps/${VSREDIST} DESTINATION tmp)
324328
endif()
325329

326330
#cpack
@@ -343,6 +347,12 @@ if(WIN32 AND NOT UNIX)
343347
set(CPACK_NSIS_CONTACT "[email protected]")
344348
set(CPACK_NSIS_MODIFY_PATH OFF)
345349
set(CPACK_NSIS_MUI_FINISHPAGE_RUN "sqlitebrowser.exe")
350+
351+
# VS redist
352+
list(APPEND CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
353+
ExecWait '$INSTDIR\\\\tmp\\\\${VSREDIST} /install /passive /quiet'
354+
Delete '$INSTDIR\\\\tmp\\\\${VSREDIST}'
355+
")
346356
else(WIN32 AND NOT UNIX)
347357
set(CPACK_STRIP_FILES "bin/sqlitebrowser")
348358
set(CPACK_SOURCE_STRIP_FILES "")

0 commit comments

Comments
 (0)