Merge pull request #997 from cjcliffe/winbuild-updates

Winbuild updates

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 2.8.12)
 
 project (CubicSDR)
 
@@ -7,7 +7,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")
 SET(CUBICSDR_VERSION_MAJOR "0")
 SET(CUBICSDR_VERSION_MINOR "2")
 SET(CUBICSDR_VERSION_PATCH "8")
-SET(CUBICSDR_VERSION_SUFFIX "a")
+SET(CUBICSDR_VERSION_SUFFIX "")
 SET(CUBICSDR_VERSION "${CUBICSDR_VERSION_MAJOR}.${CUBICSDR_VERSION_MINOR}.${CUBICSDR_VERSION_PATCH}${CUBICSDR_VERSION_SUFFIX}")
 
 SET(CPACK_PACKAGE_VERSION "${CUBICSDR_VERSION_MAJOR}.${CUBICSDR_VERSION_MINOR}.${CUBICSDR_VERSION_PATCH}")
@@ -956,7 +956,8 @@ IF (WIN32 AND BUILD_INSTALLER)
         SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CUBICSDR_INSTALL_NAME} ${CPACK_PACKAGE_VERSION} (x86)")
         set(CMAKE_CL_64 FALSE)
     ENDIF(EX_PLATFORM EQUAL 64)
-    
+    SET(BUNDLE_MSVC_REDIST "" CACHE STRING "Visual C++ Redistributable")
+
     set(CPACK_NSIS_EXECUTABLES_DIRECTORY ".") 
     install(TARGETS CubicSDR RUNTIME DESTINATION .)
 
@@ -1011,8 +1012,13 @@ IF (WIN32 AND BUILD_INSTALLER)
         set(CPACK_PACKAGE_EXECUTABLES CubicSDR "CubicSDR")
 
     IF (MSVC)
-        install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/external/msvc/${EX_PLATFORM_NAME}/vc_redist.${EX_PLATFORM_NAME}.exe DESTINATION vc_redist)
-        set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\vc_redist\\\\vc_redist.${EX_PLATFORM_NAME}.exe\\\" /passive /norestart'")
+        IF (BUNDLE_MSVC_REDIST)
+            message(STATUS "BUNDLE_MSVC_REDIST: ${BUNDLE_MSVC_REDIST}")
+            cmake_path(GET BUNDLE_MSVC_REDIST FILENAME BUNDLE_MSVC_REDIST_FN)
+            message(STATUS "BUNDLE_MSVC_REDIST_FN: ${BUNDLE_MSVC_REDIST_FN}")
+            install(PROGRAMS ${BUNDLE_MSVC_REDIST} DESTINATION vc_redist)
+            set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\vc_redist\\\\${BUNDLE_MSVC_REDIST_FN}\\\" /passive /norestart'")
+        ENDIF()        
     ENDIF (MSVC)