diff options
| author | Johnathan Corgan | 2012-03-15 08:49:11 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-03-15 08:49:11 -0700 |
| commit | 4310205cecee8f4bb22c056c9966f82b4260e169 (patch) | |
| tree | 11912a60d3b8a98d4f1c5f47ca74eaa4b46d4a69 /cmake/Modules | |
| parent | 295a0da6e3378cfe7584ba5407f519f2a69c50eb (diff) | |
| parent | 65e316fdeff9c1c1c09d4fd6cb41166ae72a004a (diff) | |
| download | gnuradio-4310205cecee8f4bb22c056c9966f82b4260e169.tar.gz gnuradio-4310205cecee8f4bb22c056c9966f82b4260e169.tar.bz2 gnuradio-4310205cecee8f4bb22c056c9966f82b4260e169.zip | |
Merge branch 'maint'
Diffstat (limited to 'cmake/Modules')
| -rw-r--r-- | cmake/Modules/GrPackage.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cmake/Modules/GrPackage.cmake b/cmake/Modules/GrPackage.cmake index 3aca79632..2d2dfa531 100644 --- a/cmake/Modules/GrPackage.cmake +++ b/cmake/Modules/GrPackage.cmake @@ -134,7 +134,13 @@ if((DEBIAN OR REDHAT) AND LSB_RELEASE_EXECUTABLE) endif() if(${CPACK_GENERATOR} STREQUAL NSIS) - set(CPACK_PACKAGE_FILE_NAME "gnuradio_${CPACK_PACKAGE_VERSION}_win32") + + ENABLE_LANGUAGE(C) + + include(CheckTypeSize) + check_type_size("void*[8]" BIT_WIDTH BUILTIN_TYPES_ONLY) + SET(CPACK_PACKAGE_FILE_NAME "gnuradio_${CPACK_PACKAGE_VERSION}_Win${BIT_WIDTH}") + set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CMAKE_PROJECT_NAME}") endif() |