frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

CPACK_SYSTEM_PROCESSOR

Browse Source
This commit is contained in:
Paulchen-Panther 2025-02-09 15:08:34 +01:00
parent ed8c6173d2
commit 32d9658589
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/scripts/build.sh vendored
View File

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

2
.github/workflows/qt5_6.yml vendored
View File

@ -82,7 +82,7 @@ jobs:
DOCKER_TAG: ${{ matrix.os.codename }}${{ inputs.qt_version == '6' && '-qt6' || '' }} DOCKER_TAG: ${{ matrix.os.codename }}${{ inputs.qt_version == '6' && '-qt6' || '' }}
PLATFORM: ${{ matrix.os.platform }} PLATFORM: ${{ matrix.os.platform }}
ENTRYPOINT: ${{ matrix.os.architecture[0] != 'amd64' && '--entrypoint /usr/bin/env' || '' }} 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] }} TARGET_ARCH: ${{ matrix.os.architecture[1] }}
- name: 📦 Upload - name: 📦 Upload

15
cmake/packages.cmake
View File

@ -23,6 +23,11 @@ IF(DEB_BUILDER_FOUND)
SET ( CPACK_GENERATOR ${CPACK_GENERATOR} "DEB") SET ( CPACK_GENERATOR ${CPACK_GENERATOR} "DEB")
ENDIF() 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) # Overwrite CMAKE_SYSTEM_NAME for mac (visual)
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
if(${CMAKE_HOST_APPLE}) if(${CMAKE_HOST_APPLE})
@ -30,12 +35,10 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
endif() endif()
endif() endif()
set(CPACK_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR}) # Overwrite CMAKE_SYSTEM_PROCESSOR for Windows (visual)
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64")
# Overwrite CPACK_SYSTEM_PROCESSOR for Windows (visual)
if(${CPACK_SYSTEM_PROCESSOR} MATCHES "AMD64")
if(${CMAKE_HOST_WIN32}) if(${CMAKE_HOST_WIN32})
set(CPACK_SYSTEM_PROCESSOR "x64") set(CMAKE_SYSTEM_PROCESSOR "x64")
endif() endif()
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 # Replease "+", as cmake/rpm has an issue if "+" occurs in CPACK_PACKAGE_VERSION
string(REPLACE "+" "." HYPERION_PACKAGE_VERSION ${HYPERION_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 "packages@hyperion-project.org") SET ( CPACK_PACKAGE_CONTACT "packages@hyperion-project.org")
SET ( CPACK_PACKAGE_VENDOR "hyperion-project") SET ( CPACK_PACKAGE_VENDOR "hyperion-project")