Fix source package file name for .tar.gz packages.

axr · Nov 27, 2012 · 39280ab · 39280ab
1 parent 29ffa4c
commit 39280ab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmake/Package.cmake b/cmake/Package.cmake
@@ -57,7 +57,7 @@ set(CPACK_COMPONENT_DOC_DESCRIPTION "Documentation for the AXR SDK and examples"
 # Filenames
 include(PackageFilenames)
 package_file_name(CPACK_PACKAGE_FILE_NAME "${AXR_PACKAGE_PREFIX}" "${AXR_VERSION_STRING}")
-src_package_file_name(CPACK_SOURCE_PACKAGE_FILE_NAME "${AXR_PACKAGE_PREFIX}" "${AXR_VERSION_STRING}")
+src_package_file_name(CPACK_SOURCE_PACKAGE_FILE_NAME "libaxr" "${AXR_VERSION_STRING}")
 set(CPACK_SOURCE_IGNORE_FILES ".git" ".DS_Store" "thumbs.db" "CMakeLists.txt.user")
 
 # Source package

diff --git a/cmake/PackageOverrides.cmake.in b/cmake/PackageOverrides.cmake.in
@@ -1,7 +1,7 @@
 if(CPACK_GENERATOR STREQUAL "DEB" OR CPACK_GENERATOR STREQUAL "RPM")
     set(CPACK_DEB_COMPONENT_INSTALL ON)
     set(CPACK_RPM_COMPONENT_INSTALL ON)
-elseif(CPACK_GENERATOR STREQUAL "TGZ")
+elseif(CPACK_GENERATOR STREQUAL "TGZ" AND NOT CPACK_PACKAGE_FILE_NAME MATCHES "-src")
     set(CPACK_PACKAGE_FILE_NAME "libaxr-${AXR_VERSION_STRING}-OPERATING_SYSTEM-${CMAKE_TARGET_ARCHITECTURE_CODE}")
 else()
     # Runtime packages on NSIS/WIX/PackageMaker don't need headers and documentation