diff options
| author | Johnathan Corgan | 2012-03-15 08:49:23 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-03-15 08:49:23 -0700 |
| commit | 2de96be2ce56dc258714fcb2ef87e8cda03f72f7 (patch) | |
| tree | c9864ab05ef5302cb90b6e320c6617e54342aaad | |
| parent | 608592851b23fd05b50aa128d12624877c08518e (diff) | |
| parent | 4310205cecee8f4bb22c056c9966f82b4260e169 (diff) | |
| download | gnuradio-2de96be2ce56dc258714fcb2ef87e8cda03f72f7.tar.gz gnuradio-2de96be2ce56dc258714fcb2ef87e8cda03f72f7.tar.bz2 gnuradio-2de96be2ce56dc258714fcb2ef87e8cda03f72f7.zip | |
Merge branch 'master' into next
| -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() |