Skip to content

Commit ed8c617

Browse files
set CMAKE_SYSTEM_PROCESSOR to var for cpack
1 parent 7135294 commit ed8c617

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

cmake/packages.cmake

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
3030
endif()
3131
endif()
3232

33-
# Overwrite CMAKE_SYSTEM_PROCESSOR for Windows (visual)
34-
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64")
33+
set(CPACK_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR})
34+
35+
# Overwrite CPACK_SYSTEM_PROCESSOR for Windows (visual)
36+
if(${CPACK_SYSTEM_PROCESSOR} MATCHES "AMD64")
3537
if(${CMAKE_HOST_WIN32})
36-
set(CMAKE_SYSTEM_PROCESSOR "x64")
38+
set(CPACK_SYSTEM_PROCESSOR "x64")
3739
endif()
3840
endif()
3941

@@ -46,7 +48,7 @@ SET ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md" )
4648

4749
# Replease "+", as cmake/rpm has an issue if "+" occurs in CPACK_PACKAGE_VERSION
4850
string(REPLACE "+" "." HYPERION_PACKAGE_VERSION ${HYPERION_VERSION})
49-
SET ( CPACK_PACKAGE_FILE_NAME "Hyperion-${HYPERION_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
51+
SET ( CPACK_PACKAGE_FILE_NAME "Hyperion-${HYPERION_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}-${CPACK_SYSTEM_PROCESSOR}")
5052

5153
SET ( CPACK_PACKAGE_CONTACT "[email protected]")
5254
SET ( CPACK_PACKAGE_VENDOR "hyperion-project")

0 commit comments

Comments
 (0)