diff --git a/cmake/packages.cmake b/cmake/packages.cmake index 8f26bcf5..15d3c687 100644 --- a/cmake/packages.cmake +++ b/cmake/packages.cmake @@ -57,11 +57,9 @@ SET ( CPACK_PACKAGE_NAME "HyperHDR" ) SET ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "HyperHDR is an open source ambient light implementation" ) SET ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md" ) if (OVERRIDE_ARCHITECTURE) - SET ( TARGET_CPU_ARCHITECTURE "${OVERRIDE_ARCHITECTURE}") -else() - SET ( TARGET_CPU_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}") + SET ( CMAKE_SYSTEM_PROCESSOR "${OVERRIDE_ARCHITECTURE}") endif(OVERRIDE_ARCHITECTURE) -SET ( CPACK_PACKAGE_FILE_NAME "HyperHDR-${HYPERHDR_VERSION}-${CMAKE_SYSTEM_NAME}-${TARGET_CPU_ARCHITECTURE}") +SET ( CPACK_PACKAGE_FILE_NAME "HyperHDR-${HYPERHDR_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}") SET ( CPACK_PACKAGE_CONTACT "see_me_at@hyperhdr.eu") SET ( CPACK_PACKAGE_VENDOR "HyperHDR") @@ -86,7 +84,7 @@ if(USE_STANDARD_INSTALLER_NAME AND UNIX AND NOT APPLE) if (foundTag EQUAL -1) string(CONCAT CPACK_PACKAGE_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}" "~${DEBIAN_NAME_TAG}") endif() - SET ( CPACK_PACKAGE_FILE_NAME "HyperHDR-${HYPERHDR_VERSION_MAJOR}.${HYPERHDR_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${TARGET_CPU_ARCHITECTURE}") + SET ( CPACK_PACKAGE_FILE_NAME "HyperHDR-${HYPERHDR_VERSION_MAJOR}.${HYPERHDR_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${CMAKE_SYSTEM_PROCESSOR}") message("Package name: ${CPACK_PACKAGE_FILE_NAME}" ) endif() endif()