diff --git a/qad/QADDeploy.cmake b/qad/QADDeploy.cmake index 9f6ff7c..7f4912d 100644 --- a/qad/QADDeploy.cmake +++ b/qad/QADDeploy.cmake @@ -322,14 +322,22 @@ macro(deploy_target _T) set_target_properties(${_T} PROPERTIES MACOSX_BUNDLE TRUE) set(_AGD "${_DEPLOY_DIR}/${_T}.app") set(_DMG "${CMAKE_CURRENT_BINARY_DIR}/dmg") + set(_CMD_COPY) + if (_ICON_NAME) + set(_CMD_COPY ${_CMD_COPY} COMMAND cp -f ${_ICON_FN} ${_AGD}/Contents/Resources) + endif() + foreach(_r ${_RES_DIRS}) + set(_CMD_RES ${_CMD_RES} COMMAND cp -r "${_r}" "${_AGD}/Contents/Resources") + endforeach() add_custom_target(deploy # gather .app dir COMMAND mkdir -p ${_AGD}/Contents/Resources COMMAND mkdir -p ${_AGD}/Contents/Frameworks - COMMAND mkdir -p ${_DEPLOY_DIR}/lang COMMAND mkdir -p ${_DESTINATION} - COMMAND cp ${_ICON_FN} ${_AGD}/Contents/Resources - COMMAND cp -r ${_DEPLOY_DIR}/lang ${_AGD}/Contents/Resources + ${_CMD_COPY} + ${_CMD_RES} + #COMMAND cp ${_ICON_FN} ${_AGD}/Contents/Resources + #COMMAND cp -r ${_DEPLOY_DIR}/lang ${_AGD}/Contents/Resources COMMAND deploy_tool -M "${CMAKE_OTOOL}" -P cocoa -S mac -q ${Qt5_ROOT} -s "\"${CMAKE_PREFIX_PATH}/lib;${DEPLOY_ADD_LIBPATH}${_DEP_LIBPATH}\"" -o ${_AGD}/Contents/Frameworks -p ${_AGD}/Contents/PlugIns ${_AGD}/Contents/MacOS/${_T} # prepare dmg dir COMMAND rm -rf ${_DMG}