diff options
| author | Ben Hilburn <ben.hilburn@ettus.com> | 2014-05-14 12:44:53 -0700 |
|---|---|---|
| committer | Ben Hilburn <ben.hilburn@ettus.com> | 2014-05-14 12:44:53 -0700 |
| commit | e02fbe4552e9fe18a49a7d9dc064b1aaf33baaea (patch) | |
| tree | 4de1b2d0dbfe6fe4331b95b95a8a4db1cac07d5f | |
| parent | 06fb769714324c9c45d0bb8d3c4f9bd373a5d674 (diff) | |
| parent | a067783cf742a0f6ad10738e53897fea4a4c6163 (diff) | |
| download | uhd-e02fbe4552e9fe18a49a7d9dc064b1aaf33baaea.tar.gz uhd-e02fbe4552e9fe18a49a7d9dc064b1aaf33baaea.tar.bz2 uhd-e02fbe4552e9fe18a49a7d9dc064b1aaf33baaea.zip | |
Merge branch 'origin/uhd/win_package_name' into maint
| -rw-r--r-- | host/cmake/Modules/UHDPackage.cmake | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/host/cmake/Modules/UHDPackage.cmake b/host/cmake/Modules/UHDPackage.cmake index 8422c24d6..d1c0fc099 100644 --- a/host/cmake/Modules/UHDPackage.cmake +++ b/host/cmake/Modules/UHDPackage.cmake @@ -87,7 +87,21 @@ IF(${CPACK_GENERATOR} STREQUAL NSIS) include(CheckTypeSize) check_type_size("void*[8]" BIT_WIDTH BUILTIN_TYPES_ONLY) - SET(CPACK_PACKAGE_FILE_NAME "uhd_${UHD_VERSION}_Win${BIT_WIDTH}") + # If CMake option given, specify MSVC version in installer filename + IF(SPECIFY_MSVC_VERSION) + IF(MSVC90) # Visual Studio 2008 (9.0) + SET(MSVC_VERSION "VS2008") + ELSEIF(MSVC10) # Visual Studio 2010 (10.0) + SET(MSVC_VERSION "VS2010") + ELSEIF(MSVC11) # Visual Studio 2012 (11.0) + SET(MSVC_VERSION "VS2012") + ELSEIF(MSVC12) # Visual Studio 2013 (12.0) + SET(MSVC_VERSION "VS2013") + ENDIF() + SET(CPACK_PACKAGE_FILE_NAME "uhd_${UHD_VERSION}_Win${BIT_WIDTH}_${MSVC_VERSION}") + ELSE() + SET(CPACK_PACKAGE_FILE_NAME "uhd_${UHD_VERSION}_Win${BIT_WIDTH}") + ENDIF(SPECIFY_MSVC_VERSION) SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${CMAKE_PROJECT_NAME}") ENDIF() |