mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
CPACK_SYSTEM_PROCESSOR
This commit is contained in:
@@ -23,6 +23,11 @@ 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})
|
||||
@@ -30,12 +35,10 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
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 "packages@hyperion-project.org")
|
||||
SET ( CPACK_PACKAGE_VENDOR "hyperion-project")
|
||||
|
Reference in New Issue
Block a user