|
|
@@ -247,13 +247,13 @@ IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
|
|
|
SET(CPACK_SOURCE_PACKAGE_FILE_NAME
|
|
|
"cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
|
|
|
IF(NOT DEFINED CPACK_SYSTEM_NAME)
|
|
|
- SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
|
|
|
+ SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
|
|
|
ENDIF(NOT DEFINED CPACK_SYSTEM_NAME)
|
|
|
IF(${CPACK_SYSTEM_NAME} MATCHES Windows)
|
|
|
IF(CMAKE_CL_64)
|
|
|
- SET(CPACK_SYSTEM_NAME win64)
|
|
|
+ SET(CPACK_SYSTEM_NAME win64-${CMAKE_SYSTEM_PROCESSOR})
|
|
|
ELSE(CMAKE_CL_64)
|
|
|
- SET(CPACK_SYSTEM_NAME win32)
|
|
|
+ SET(CPACK_SYSTEM_NAME win32-${CMAKE_SYSTEM_PROCESSOR})
|
|
|
ENDIF(CMAKE_CL_64)
|
|
|
ENDIF(${CPACK_SYSTEM_NAME} MATCHES Windows)
|
|
|
IF(NOT DEFINED CPACK_PACKAGE_FILE_NAME)
|