summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorNicholas Corgan2012-03-14 10:44:55 -0700
committerNicholas Corgan2012-03-14 10:44:55 -0700
commit65e316fdeff9c1c1c09d4fd6cb41166ae72a004a (patch)
tree7ac858d8b072c4f900f09b2ee56f6c57285a7311 /cmake
parent8e013157752f1b42665430fde0f1c6f7d7147153 (diff)
downloadgnuradio-65e316fdeff9c1c1c09d4fd6cb41166ae72a004a.tar.gz
gnuradio-65e316fdeff9c1c1c09d4fd6cb41166ae72a004a.tar.bz2
gnuradio-65e316fdeff9c1c1c09d4fd6cb41166ae72a004a.zip
cmake: Windows uses size of void* to determine x86 vs. x64 and names installer .exe accordingly
Diffstat (limited to 'cmake')
-rw-r--r--cmake/Modules/GrPackage.cmake8
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()