@@ -135,8 +135,8 @@ elseif(APPLE)
135135 ${MACDEPLOYQT_EXECUTABLE}
136136 $<TARGET_BUNDLE_DIR:${PROJECT_TARGET_NAME} >
137137 )
138- if (DEFINED APPLE_ID )
139- set (DEPLOY_COMMAND ${DEPLOY_COMMAND} -codesign=${APPLE_ID } )
138+ if (DEFINED CODESIGN_ID )
139+ set (DEPLOY_COMMAND ${DEPLOY_COMMAND} -codesign=${CODESIGN_ID } )
140140 endif ()
141141else ()
142142 get_filename_component (_qt_dir "${_qt_bin_dir} " DIRECTORY )
@@ -212,12 +212,14 @@ if(APPLE)
212212 )
213213
214214 # Explicit sign with Hardened Runtime -------------------------------------
215+ if (DEFINED CODESIGN_ID)
215216 add_custom_target (codesign ALL
216- COMMAND /usr/bin/codesign -vvv --deep --strict --force --options runtime --timestamp --sign ${CODESIGN_ID} "${APP_DIR_NEW} "
217- DEPENDS gen-dsstore
218- COMMENT "Codesign with Hardened Runtime"
219- VERBATIM
220- )
217+ COMMAND /usr/bin/codesign -vvv --deep --strict --force --options runtime --timestamp --sign ${CODESIGN_ID} "${APP_DIR_NEW} "
218+ DEPENDS gen-dsstore
219+ COMMENT "Codesign with Hardened Runtime"
220+ VERBATIM
221+ )
222+ endif ()
221223endif ()
222224
223225# Install ---------------------------------------------------------------------
@@ -259,8 +261,21 @@ set(CPACK_PACKAGE_RELEASE "1")
259261set (CPACK_PACKAGE_CONTACT "${PROJECT_EMAIL} " )
260262set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_DESCRIPTION} " )
261263set (CPACK_PACKAGE_HOMEPAGE_URL "${PROJECT_WWW} " )
262- set (CPACK_SYSTEM_NAME "${CMAKE_HOST_SYSTEM_NAME} " )
263- set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME} -${CPACK_PACKAGE_VERSION} -${CPACK_SYSTEM_NAME} -${CMAKE_SYSTEM_PROCESSOR} " )
264+ set (_qt_kernel "${CMAKE_SYSTEM_NAME} " )
265+ string (TOLOWER "${_qt_kernel} " _qt_kernel)
266+ if (_qt_kernel STREQUAL "windows" )
267+ set (_qt_kernel "winnt" )
268+ endif ()
269+ set (CPACK_SYSTEM_NAME "${_qt_kernel} " )
270+ set (_qt_processor "${CMAKE_SYSTEM_PROCESSOR} " )
271+ string (TOLOWER "${_qt_processor} " _qt_processor)
272+ if (_qt_processor STREQUAL "AMD64" )
273+ set (_qt_processor "x86_64" )
274+ endif ()
275+ if (_qt_processor STREQUAL "aarch64" )
276+ set (_qt_processor "arm64" )
277+ endif ()
278+ set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME} -${CPACK_PACKAGE_VERSION} -${CPACK_SYSTEM_NAME} -${_qt_processor} " )
264279
265280if (APPLE )
266281 set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_BINARY_DIR} /LICENSE.rtf" )
0 commit comments