diff --git a/cmake/DeployMacros.cmake b/cmake/DeployMacros.cmake index f60945e7..d1e530d2 100644 --- a/cmake/DeployMacros.cmake +++ b/cmake/DeployMacros.cmake @@ -639,13 +639,13 @@ macro(deploy_target _T) set(CMAKE_PREFIX_PATH "/usr/local") endif() set(_cmd_gen_dmg COMMAND genisoimage -quiet -V "${MACOSX_BUNDLE_BUNDLE_NAME}" -D -R -apple -no-pad -o ${_DESTINATION}/${_TV}.dmg ${_DMG}) - set(_cmd_int) + #set(_cmd_int) if (__mac_host) set(_cmd_gen_dmg COMMAND hdiutil create ${_DESTINATION}/${_TV}.dmg -ov -volname "${MACOSX_BUNDLE_BUNDLE_NAME}" -fs HFS+ -srcfolder ${_DMG}) - set(_rpathes "@executable_path/../Frameworks" "@executable_path/lib" "@loader_path/../lib") - foreach (_r ${_rpathes}) - set(_cmd_int ${_cmd_int} COMMAND install_name_tool -add_rpath "${_r}" \"${_AGD}/Contents/MacOS/${_T}\") - endforeach() + #set(_rpathes "@executable_path/../Frameworks" "@executable_path/lib" "@loader_path/../lib") + #foreach (_r ${_rpathes}) + # set(_cmd_int ${_cmd_int} COMMAND install_name_tool -add_rpath "${_r}" \"${_AGD}/Contents/MacOS/${_T}\") + #endforeach() endif() add_custom_target(deploy_${_T} # gather .app dir @@ -656,7 +656,7 @@ macro(deploy_target _T) #COMMAND cp ${_ICON_FN} ${_AGD}/Contents/Resources #COMMAND cp -r ${_DEPLOY_DIR}/lang ${_AGD}/Contents/Resources COMMAND deploy_tool ${_VERB} ${_OPTIONS} -M "${CMAKE_OTOOL}" -P cocoa,minimal -S mac -q ${Qt5_ROOT} -s "\"${CMAKE_PREFIX_PATH}/lib${_dt_delim}${DEPLOY_ADD_LIBPATH}${_DEP_LIBPATH}\"" -o ${_AGD}/Contents/Frameworks -p ${_AGD}/Contents/PlugIns ${_AGD}/Contents/MacOS/${_T} ${_ADD_DEPS} - ${_cmd_int} + #${_cmd_int} # prepare dmg dir COMMAND rm -rf ${_DMG} COMMAND mkdir ${_VERB} -p ${_DMG}