Skip to content

Commit 2c2fa78

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

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

Diff for: build.sh

+4
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,10 @@ elif [[ "$CI_NAME" == 'linux' ]]; then
188188
BUILD_OPTION="-DUSE_CCACHE_CACHING=OFF ${ARCHIVE_OPTION}"
189189
cache_env="true"
190190
fi
191+
192+
if [[ $DOCKER_IMAGE == *"armv6l"* ]] && [[ $CI_TYPE == "github_action" ]]; then
193+
BUILD_OPTION="-DOVERRIDE_ARCHITECTURE=armv6l ${BUILD_OPTION}"
194+
fi
191195

192196
echo "Build option: ${BUILD_OPTION}, ccache: ${cache_env}"
193197

Diff for: cmake/packages.cmake

+7-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,12 @@ endif()
5656
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" )
59-
SET ( CPACK_PACKAGE_FILE_NAME "HyperHDR-${HYPERHDR_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
59+
if (OVERRIDE_ARCHITECTURE)
60+
SET ( TARGET_CPU_ARCHITECTURE "${OVERRIDE_ARCHITECTURE}")
61+
else()
62+
SET ( TARGET_CPU_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}")
63+
endif(OVERRIDE_ARCHITECTURE)
64+
SET ( CPACK_PACKAGE_FILE_NAME "HyperHDR-${HYPERHDR_VERSION}-${CMAKE_SYSTEM_NAME}-${TARGET_CPU_ARCHITECTURE}")
6065

6166
SET ( CPACK_PACKAGE_CONTACT "[email protected]")
6267
SET ( CPACK_PACKAGE_VENDOR "HyperHDR")
@@ -81,7 +86,7 @@ if(USE_STANDARD_INSTALLER_NAME AND UNIX AND NOT APPLE)
8186
if (foundTag EQUAL -1)
8287
string(CONCAT CPACK_PACKAGE_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}" "~${DEBIAN_NAME_TAG}")
8388
endif()
84-
SET ( CPACK_PACKAGE_FILE_NAME "HyperHDR-${HYPERHDR_VERSION_MAJOR}.${HYPERHDR_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${CMAKE_SYSTEM_PROCESSOR}")
89+
SET ( CPACK_PACKAGE_FILE_NAME "HyperHDR-${HYPERHDR_VERSION_MAJOR}.${HYPERHDR_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${TARGET_CPU_ARCHITECTURE}")
8590
message("Package name: ${CPACK_PACKAGE_FILE_NAME}" )
8691
endif()
8792
endif()

0 commit comments

Comments
 (0)