summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnathan Corgan2012-02-29 11:51:19 -0800
committerJohnathan Corgan2012-02-29 11:51:19 -0800
commited72fd930b6c7c23273c928d02b54587c0cac9a3 (patch)
treeb8058985efabe3f0162453808f37be2d3ae9d330
parent030cfac62db69b8eb19ae5a79ae6ec71d113b47b (diff)
parent4c509e6ef6ce56c057ffb31db36ef2d7a23879f3 (diff)
downloadgnuradio-ed72fd930b6c7c23273c928d02b54587c0cac9a3.tar.gz
gnuradio-ed72fd930b6c7c23273c928d02b54587c0cac9a3.tar.bz2
gnuradio-ed72fd930b6c7c23273c928d02b54587c0cac9a3.zip
Merge branch 'master' into next
-rw-r--r--cmake/Modules/GrPackage.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/cmake/Modules/GrPackage.cmake b/cmake/Modules/GrPackage.cmake
index 92f2567f9..3aca79632 100644
--- a/cmake/Modules/GrPackage.cmake
+++ b/cmake/Modules/GrPackage.cmake
@@ -134,6 +134,7 @@ if((DEBIAN OR REDHAT) AND LSB_RELEASE_EXECUTABLE)
endif()
if(${CPACK_GENERATOR} STREQUAL NSIS)
+ set(CPACK_PACKAGE_FILE_NAME "gnuradio_${CPACK_PACKAGE_VERSION}_win32")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CMAKE_PROJECT_NAME}")
endif()