diff options
| author | Ben Hilburn <ben.hilburn@ettus.com> | 2014-05-14 13:05:45 -0700 |
|---|---|---|
| committer | Ben Hilburn <ben.hilburn@ettus.com> | 2014-05-14 13:05:45 -0700 |
| commit | 2f0b3fd72b81242b8c27055f32038a60d424bbe9 (patch) | |
| tree | 310ff69b19464ce188682842ec7fc0e5693ad86e /host/cmake | |
| parent | cd8f7ed98ca687f0aab886e505950f7f1d176316 (diff) | |
| parent | 43512ede595816dd911208fd2291028b4dead3e1 (diff) | |
| download | uhd-2f0b3fd72b81242b8c27055f32038a60d424bbe9.tar.gz uhd-2f0b3fd72b81242b8c27055f32038a60d424bbe9.tar.bz2 uhd-2f0b3fd72b81242b8c27055f32038a60d424bbe9.zip | |
Merging maint. Includes manual changes which break B200 Doxygen page
Diffstat (limited to 'host/cmake')
| -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() |