CPACK_SYSTEM_PROCESSOR

Author: Paulchen-Panther

.github/scripts/build.sh

@@ -5,7 +5,7 @@
 [ -z "${TARGET_ARCH}" ] && TARGET_ARCH="linux/amd64"
 [ -z "${ENTRYPOINT}" ] && ENTRYPOINT=""
 [ -z "${PLATFORM}" ] && PLATFORM="x11"
-[ -z "${CMAKE_SYSTEM_PROCESSOR}" ] && CMAKE_SYSTEM_PROCESSOR=""
+[ -z "${CPACK_SYSTEM_PROCESSOR}" ] && CPACK_SYSTEM_PROCESSOR=""
 
 # Determine cmake build type; tag builds are Release, else Debug (-dev appends to platform)
 if [[ $GITHUB_REF == *"refs/tags"* ]]; then
@@ -46,7 +46,7 @@ elif [[ "$RUNNER_OS" == 'Linux' ]]; then
 		-v "${GITHUB_WORKSPACE}:/source:rw" \
 		$REGISTRY_URL:$DOCKER_TAG \
 		/bin/bash -c "mkdir -p /source/build && cd /source/build &&
-		cmake -G Ninja -DPLATFORM=${PLATFORM} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${CMAKE_SYSTEM_PROCESSOR} .. || exit 2 &&
+		cmake -G Ninja -DPLATFORM=${PLATFORM} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${CPACK_SYSTEM_PROCESSOR} .. || exit 2 &&
 		cmake --build . --target package -- -j $(nproc) || exit 3 || : &&
 		cp /source/build/bin/h* /deploy/ 2>/dev/null || : &&
 		cp /source/build/Hyperion-* /deploy/ 2>/dev/null || : &&

.github/workflows/qt5_6.yml

@@ -82,7 +82,7 @@ jobs:
           DOCKER_TAG: ${{ matrix.os.codename }}${{ inputs.qt_version == '6' && '-qt6' || '' }}
           PLATFORM: ${{ matrix.os.platform }}
           ENTRYPOINT: ${{ matrix.os.architecture[0] != 'amd64' && '--entrypoint /usr/bin/env' || '' }}
-          CMAKE_SYSTEM_PROCESSOR: ${{ matrix.os.architecture[0] != 'amd64' && format('-DCMAKE_SYSTEM_PROCESSOR={0}', matrix.target_lookup[format('{0}', matrix.os.architecture[0])]) || '' }}
+          CPACK_SYSTEM_PROCESSOR: ${{ matrix.os.architecture[0] != 'amd64' && format('-DCPACK_SYSTEM_PROCESSOR={0}', matrix.target_lookup[format('{0}', matrix.os.architecture[0])]) || '' }}
           TARGET_ARCH: ${{ matrix.os.architecture[1] }}
 
       - name: 📦 Upload

cmake/packages.cmake

@@ -23,19 +23,22 @@ IF(DEB_BUILDER_FOUND)
 	SET ( CPACK_GENERATOR ${CPACK_GENERATOR} "DEB")
 ENDIF()
 
+# Parameter CPACK_SYSTEM_PROCESSOR overwrites CMAKE_SYSTEM_PROCESSOR
+if(CPACK_SYSTEM_PROCESSOR)
+	set(CMAKE_SYSTEM_PROCESSOR ${CPACK_SYSTEM_PROCESSOR})
+endif()
+
 # Overwrite CMAKE_SYSTEM_NAME for mac (visual)
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     if(${CMAKE_HOST_APPLE})
         set(CMAKE_SYSTEM_NAME "macOS")
     endif()
 endif()
 
-set(CPACK_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR})
-
-# Overwrite CPACK_SYSTEM_PROCESSOR for Windows (visual)
-if(${CPACK_SYSTEM_PROCESSOR} MATCHES "AMD64")
+# Overwrite CMAKE_SYSTEM_PROCESSOR for Windows (visual)
+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64")
     if(${CMAKE_HOST_WIN32})
-        set(CPACK_SYSTEM_PROCESSOR "x64")
+        set(CMAKE_SYSTEM_PROCESSOR "x64")
     endif()
 endif()
 
@@ -48,7 +51,7 @@ SET ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md" )
 
 # Replease "+", as cmake/rpm has an issue if "+" occurs in CPACK_PACKAGE_VERSION
 string(REPLACE "+" "." HYPERION_PACKAGE_VERSION ${HYPERION_VERSION})
-SET ( CPACK_PACKAGE_FILE_NAME "Hyperion-${HYPERION_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}-${CPACK_SYSTEM_PROCESSOR}")
+SET ( CPACK_PACKAGE_FILE_NAME "Hyperion-${HYPERION_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
 
 SET ( CPACK_PACKAGE_CONTACT "[email protected]")
 SET ( CPACK_PACKAGE_VENDOR "hyperion-project")