From 39280ab2b2cdec5756c8d6533ae55d07528c2f10 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Tue, 27 Nov 2012 14:08:50 -0500 Subject: [PATCH] Fix source package file name for .tar.gz packages. --- cmake/Package.cmake | 2 +- cmake/PackageOverrides.cmake.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/Package.cmake b/cmake/Package.cmake index ddf72182..52a8f788 100644 --- 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 index 372114e8..4a201adb 100644 --- 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