Commit d99d83f
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -15,10 +15,12 @@ if(WIN32 AND MSVC) | |||
| 15 | 15 | set(QT5_PATH "E:/Qt64/Qt5.4.1/5.4/msvc2013_64") | |
| 16 | 16 | set(SQLITE3_PATH "E:/libs/sqlite3_x64") | |
| 17 | 17 | set(OPENSSL_PATH "E:/libs/openssl-1.0.2a-x64_86-win64") | |
| 18 | + set(VSREDIST "vcredist_x64.exe") | ||
| 18 | 19 | else() | |
| 19 | 20 | set(QT5_PATH "E:/Qt/Qt5.4.1/5.4/msvc2013") | |
| 20 | 21 | set(SQLITE3_PATH "E:/libs/sqlite3") | |
| 21 | 22 | set(OPENSSL_PATH "E:/libs/openssl-1.0.2a-i386-win32") | |
| 23 | + set(VSREDIST "vcredist_x86.exe") | ||
| 22 | 24 | endif() | |
| 23 | 25 | set(USE_QT5 TRUE) | |
| 24 | 26 | set(CMAKE_PREFIX_PATH "${QT5_PATH};${SQLITE3_PATH}") | |
@@ -321,6 +323,8 @@ if(WIN32 AND MSVC) | |||
| 321 | 323 | install(FILES | |
| 322 | 324 | ${QT5_PATH}/plugins/platforms/qwindows.dll | |
| 323 | 325 | DESTINATION bin/platforms) | |
| 326 | + | ||
| 327 | + install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/deps/${VSREDIST} DESTINATION tmp) | ||
| 324 | 328 | endif() | |
| 325 | 329 | ||
| 326 | 330 | #cpack | |
@@ -343,6 +347,12 @@ if(WIN32 AND NOT UNIX) | |||
| 343 | 347 | set(CPACK_NSIS_CONTACT "peinthor@gmail.com") | |
| 344 | 348 | set(CPACK_NSIS_MODIFY_PATH OFF) | |
| 345 | 349 | 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 | + ") | ||
| 346 | 356 | else(WIN32 AND NOT UNIX) | |
| 347 | 357 | set(CPACK_STRIP_FILES "bin/sqlitebrowser") | |
| 348 | 358 | set(CPACK_SOURCE_STRIP_FILES "") | |
0 commit comments