diff --git a/FindMSVCRedist.cmake b/FindMSVCRedist.cmake index 099defc8f1372fb85ee33fdc9466a67eb1f132bf..50cb6814c2a4ce558720800677d245c3137c07b1 100644 --- a/FindMSVCRedist.cmake +++ b/FindMSVCRedist.cmake @@ -5,6 +5,9 @@ IF (MSVC) if (MSVC90) set(VCVERS 9) endif() + if (MSVC10) + set(VCVERS 10) + endif() IF(CMAKE_CL_64) #IF(MSVC_VERSION GREATER 1599) @@ -23,19 +26,23 @@ IF (MSVC) set(SDKVERS "2.0") endif() if(${VCVERS} EQUAL 9) - set(SDKVERS "3.5") + set(SDKVERS "v6.0A") + endif() + if(${VCVERS} EQUAL 10) + set(SDKVERS "v7.0A") endif() - IF(MSVC${VCVERS}0) + IF(MSVC${VCVERS}0 OR MSVC${VCVERS}) FIND_PROGRAM(MSVC_REDIST NAMES vcredist_${CMAKE_MSVC_ARCH}/vcredist_${CMAKE_MSVC_ARCH}.exe PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\${VCVERS}.0;InstallDir]/../../SDK/v${SDKVERS}/BootStrapper/Packages/" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\${VCVERS}.0;InstallDir]/../../SDK/v${SDKVERS}/BootStrapper/Packages/" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\VisualStudio\\${VCVERS}.0;InstallDir]/../../SDK/v${SDKVERS}/BootStrapper/Packages/" +"C:/Program Files (x86)/Microsoft SDKs/Windows/${SDKVERS}/Bootstrapper/Packages/" ) GET_FILENAME_COMPONENT(vcredist_name "${MSVC_REDIST}" NAME) INSTALL(PROGRAMS ${MSVC_REDIST} COMPONENT msvc_redist DESTINATION bin) SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\bin\\\\${vcredist_name}\\\"'") message(STATUS "MSVC_REDIST: ${MSVC_REDIST}") - ENDIF(MSVC${VCVERS}0) + ENDIF(MSVC${VCVERS}0 OR MSVC${VCVERS}) ENDIF () \ No newline at end of file