Skip to content

Commit a9b5161

Browse files
committed
Fix armv6l packages naming 2
1 parent 2c2fa78 commit a9b5161

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

Diff for: cmake/packages.cmake

+3-5
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,9 @@ SET ( CPACK_PACKAGE_NAME "HyperHDR" )
5757
SET ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "HyperHDR is an open source ambient light implementation" )
5858
SET ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md" )
5959
if (OVERRIDE_ARCHITECTURE)
60-
SET ( TARGET_CPU_ARCHITECTURE "${OVERRIDE_ARCHITECTURE}")
61-
else()
62-
SET ( TARGET_CPU_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}")
60+
SET ( CMAKE_SYSTEM_PROCESSOR "${OVERRIDE_ARCHITECTURE}")
6361
endif(OVERRIDE_ARCHITECTURE)
64-
SET ( CPACK_PACKAGE_FILE_NAME "HyperHDR-${HYPERHDR_VERSION}-${CMAKE_SYSTEM_NAME}-${TARGET_CPU_ARCHITECTURE}")
62+
SET ( CPACK_PACKAGE_FILE_NAME "HyperHDR-${HYPERHDR_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
6563

6664
SET ( CPACK_PACKAGE_CONTACT "[email protected]")
6765
SET ( CPACK_PACKAGE_VENDOR "HyperHDR")
@@ -86,7 +84,7 @@ if(USE_STANDARD_INSTALLER_NAME AND UNIX AND NOT APPLE)
8684
if (foundTag EQUAL -1)
8785
string(CONCAT CPACK_PACKAGE_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}" "~${DEBIAN_NAME_TAG}")
8886
endif()
89-
SET ( CPACK_PACKAGE_FILE_NAME "HyperHDR-${HYPERHDR_VERSION_MAJOR}.${HYPERHDR_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${TARGET_CPU_ARCHITECTURE}")
87+
SET ( CPACK_PACKAGE_FILE_NAME "HyperHDR-${HYPERHDR_VERSION_MAJOR}.${HYPERHDR_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${CMAKE_SYSTEM_PROCESSOR}")
9088
message("Package name: ${CPACK_PACKAGE_FILE_NAME}" )
9189
endif()
9290
endif()

0 commit comments

Comments
 (0)