diff options
| author | Tom Rondeau | 2012-02-29 21:25:14 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2012-02-29 21:25:14 -0500 |
| commit | e115a781c218c7dd48a26e7d231b58fe6f160f02 (patch) | |
| tree | 5b2cd27779b8afcf277e99a0d5c1b8da1c07ae25 /cmake/Modules | |
| parent | ba93a3b70cd335933aa57023b7d2945ed408a9cf (diff) | |
| parent | 4c509e6ef6ce56c057ffb31db36ef2d7a23879f3 (diff) | |
| download | gnuradio-e115a781c218c7dd48a26e7d231b58fe6f160f02.tar.gz gnuradio-e115a781c218c7dd48a26e7d231b58fe6f160f02.tar.bz2 gnuradio-e115a781c218c7dd48a26e7d231b58fe6f160f02.zip | |
Merge branch 'master' of gnuradio.org:gnuradio
Diffstat (limited to 'cmake/Modules')
| -rw-r--r-- | cmake/Modules/GrPackage.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/Modules/GrPackage.cmake b/cmake/Modules/GrPackage.cmake index a65a2f8a7..3aca79632 100644 --- a/cmake/Modules/GrPackage.cmake +++ b/cmake/Modules/GrPackage.cmake @@ -123,7 +123,7 @@ if((DEBIAN OR REDHAT) AND LSB_RELEASE_EXECUTABLE) ) #set a more sensible package name for this system - SET(CPACK_PACKAGE_FILE_NAME "gnuradio-${CPACK_PACKAGE_VERSION}-${LSB_ID}-${LSB_RELEASE}-${CMAKE_SYSTEM_PROCESSOR}") + SET(CPACK_PACKAGE_FILE_NAME "gnuradio_${CPACK_PACKAGE_VERSION}_${LSB_ID}-${LSB_RELEASE}-${CMAKE_SYSTEM_PROCESSOR}") #now try to include the component based dependencies set(package_deps_file "${CMAKE_SOURCE_DIR}/cmake/Packaging/${LSB_ID}-${LSB_RELEASE}.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() |