From 65e316fdeff9c1c1c09d4fd6cb41166ae72a004a Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Wed, 14 Mar 2012 10:44:55 -0700 Subject: cmake: Windows uses size of void* to determine x86 vs. x64 and names installer .exe accordingly --- cmake/Modules/GrPackage.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'cmake') 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() -- cgit