From 633fdc8553c7f17f4e50a1e45fece8a686a57845 Mon Sep 17 00:00:00 2001
From: Ivan Pelipenko <peri4ko@yandex.ru>
Date: Fri, 23 Apr 2021 14:53:06 +0300
Subject: [PATCH] try to fix pathes with spaces

---
 DeployMacros.cmake | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/DeployMacros.cmake b/DeployMacros.cmake
index f5b23f6..1d0845f 100644
--- a/DeployMacros.cmake
+++ b/DeployMacros.cmake
@@ -762,7 +762,7 @@ macro(deploy_target _T)
 		list(APPEND _CMD_ COMMAND echo "Version: ${_DEBVERSION}" ${_C_echo})
 		list(APPEND _CMD_ COMMAND echo "Architecture: ${_DEB_ARCH}" ${_C_echo})
 		list(APPEND _CMD_ COMMAND echo "Maintainer: ${${_T}_COMPANY} <>" ${_C_echo})
-		list(APPEND _CMD_ COMMAND ${PIP_DEPLOY_TOOL} ${_OPTIONS} --prefix "Depends: " --dependencies ${_dt_opts} -a "${_DEP_LIBS_CS}" -o "${_lib_path}" ${_bin_path}/$<TARGET_FILE_NAME:${_T}> ${_ADD_DEPS} ${_C_echo})
+		list(APPEND _CMD_ COMMAND ${PIP_DEPLOY_TOOL} ${_OPTIONS} --prefix "Depends: " --dependencies ${_dt_opts} -a "${_DEP_LIBS_CS}" -o "${_lib_path}" "${_bin_path}/$<TARGET_FILE_NAME:${_T}>" ${_ADD_DEPS} ${_C_echo})
 		list(APPEND _CMD_ COMMAND echo "Conflicts:" ${_C_echo})
 		list(APPEND _CMD_ COMMAND echo "Replaces:" ${_C_echo})
 		list(APPEND _CMD_ COMMAND echo "Section: misc" ${_C_echo})
@@ -788,9 +788,9 @@ macro(deploy_target _T)
 			${_CMD_}
 
 			# generate deb
-			COMMAND cd ${_AGD} "&&" md5deep -rl opt usr ">" DEBIAN/md5sums
-			COMMAND mkdir ${_VERB} -p ${_DESTINATION}
-			COMMAND dpkg-deb -Z gzip -b ${_AGD} ${_DESTINATION}/${_deb_name}
+			COMMAND cd "${_AGD}" "&&" md5deep -rl opt usr ">" DEBIAN/md5sums
+			COMMAND mkdir ${_VERB} -p "${_DESTINATION}"
+			COMMAND dpkg-deb -Z gzip -b "${_AGD}" "${_DESTINATION}/${_deb_name}"
 			VERBATIM
 			COMMENT "Generating ${_deb_name}"
 			)
@@ -842,8 +842,8 @@ macro(deploy_target _T)
 				${_CMD_}
 
 				# generate deb
-				COMMAND mkdir ${_VERB} -p ${_DESTINATION}
-				COMMAND dpkg-deb -Z gzip -b ${_AGD} ${_DESTINATION}/${_deb_name}
+				COMMAND mkdir ${_VERB} -p "${_DESTINATION}"
+				COMMAND dpkg-deb -Z gzip -b "${_AGD}" "${_DESTINATION}/${_deb_name}"
 				VERBATIM
 				COMMENT "Generating ${_deb_name}"
 				)
@@ -872,7 +872,7 @@ macro(deploy_target _T)
 			# gather dir
 			${_CMD_}
 
-			COMMAND ${PIP_DEPLOY_TOOL} ${_VERB} ${_OPTIONS} -W "\"${CMAKE_OBJDUMP}\"" -P windows,minimal -S windows -q "\"${Qt5_ROOT}\"" -s "\"${CMAKE_PREFIX_PATH}/bin${_dt_delim}${MINGW_BIN}${_add_search_path}${_dt_delim}${MINGW_LIB}\"" -o ${_AGD} -p ${_AGD} "\"${_AGD}$<TARGET_FILE_NAME:${_T}>\"" ${_ADD_DEPS}
+			COMMAND ${PIP_DEPLOY_TOOL} ${_VERB} ${_OPTIONS} -W "\"${CMAKE_OBJDUMP}\"" -P windows,minimal -S windows -q "\"${Qt5_ROOT}\"" -s "\"${CMAKE_PREFIX_PATH}/bin${_dt_delim}${MINGW_BIN}${_add_search_path}${_dt_delim}${MINGW_LIB}\"" -o "${_AGD}" -p "${_AGD}" "\"${_AGD}$<TARGET_FILE_NAME:${_T}>\"" ${_ADD_DEPS}
 			# zip
 			COMMAND cd "\"${_DEPLOY_DIR}\"" "&&" zip -q -r "\"${_DESTINATION}/${_zip_name}\"" "\"${_TV}_win_${MY_ARCH}\""
 			COMMENT "Generating ${_zip_name}"
@@ -898,7 +898,7 @@ macro(deploy_target _T)
 		__make_copy(_CMD_ _FILE_DIRS _FILE_FILES "${_AGD}/Contents/MacOS")
 		__make_copy(_CMD_ _LIBS_DIRS _LIBS_FILES "${_AGD}/Contents/Frameworks")
 		if (_ICON_NAME)
-			set(_CMD_ ${_CMD_} COMMAND cp ${_VERB} -f ${_ICON_FN} ${_AGD}/Contents/Resources)
+			set(_CMD_ ${_CMD_} COMMAND cp ${_VERB} -f "${_ICON_FN}" "${_AGD}/Contents/Resources")
 		endif()
 		if (NOT CMAKE_OTOOL)
 			set(CMAKE_OTOOL "otool")
@@ -907,9 +907,9 @@ macro(deploy_target _T)
 			set(CMAKE_PREFIX_PATH "/usr/local")
 		endif()
 		set(_dmg_name "${_TV}_macosx_x64.dmg")
-		set(_cmd_gen_dmg COMMAND genisoimage -quiet -V "${MACOSX_BUNDLE_BUNDLE_NAME}" -D -R -apple -no-pad -o ${_DESTINATION}/${_dmg_name} ${_DMG})
+		set(_cmd_gen_dmg COMMAND genisoimage -quiet -V "${MACOSX_BUNDLE_BUNDLE_NAME}" -D -R -apple -no-pad -o "${_DESTINATION}/${_dmg_name}" "${_DMG}")
 		if (__mac_host)
-			set(_cmd_gen_dmg COMMAND hdiutil create ${_DESTINATION}/${_dmg_name} -ov -volname "${MACOSX_BUNDLE_BUNDLE_NAME}" -fs HFS+ -srcfolder ${_DMG})
+			set(_cmd_gen_dmg COMMAND hdiutil create "${_DESTINATION}/${_dmg_name}" -ov -volname "${MACOSX_BUNDLE_BUNDLE_NAME}" -fs HFS+ -srcfolder "${_DMG}")
 		endif()
 		if (_ZIP_DMG)
 			set(_cmd_gen_dmg ${_cmd_gen_dmg} COMMAND zip -q -r "\"${_DESTINATION}/${_dmg_name}.zip\"" "\"${_DESTINATION}/${_dmg_name}\"")
@@ -921,16 +921,16 @@ macro(deploy_target _T)
 		endif()
 		add_custom_target(deploy_${_T}
 			# gather .app dir
-			COMMAND mkdir ${_VERB} -p ${_AGD}/Contents/Resources
-			COMMAND mkdir ${_VERB} -p ${_AGD}/Contents/Frameworks
-			COMMAND mkdir ${_VERB} -p ${_DESTINATION}
+			COMMAND mkdir ${_VERB} -p "${_AGD}/Contents/Resources"
+			COMMAND mkdir ${_VERB} -p "${_AGD}/Contents/Frameworks"
+			COMMAND mkdir ${_VERB} -p "${_DESTINATION}"
 			${_CMD_}
-			COMMAND ${PIP_DEPLOY_TOOL} ${_VERB} ${_OPTIONS} -M "${CMAKE_OTOOL}" -P cocoa,minimal -S mac -q ${Qt5_ROOT} -s "\"${CMAKE_PREFIX_PATH}/lib${_add_search_path}\"" -o ${_AGD}/Contents/Frameworks -p ${_AGD}/Contents/PlugIns ${_AGD}/Contents/MacOS/${_T} ${_ADD_DEPS}
+			COMMAND ${PIP_DEPLOY_TOOL} ${_VERB} ${_OPTIONS} -M "${CMAKE_OTOOL}" -P cocoa,minimal -S mac -q "${Qt5_ROOT}" -s "\"${CMAKE_PREFIX_PATH}/lib${_add_search_path}\"" -o "${_AGD}/Contents/Frameworks" -p "${_AGD}/Contents/PlugIns" "${_AGD}/Contents/MacOS/${_T}" ${_ADD_DEPS}
 			# prepare dmg dir
-			COMMAND rm -rf ${_DMG}
-			COMMAND mkdir ${_VERB} -p ${_DMG}
-			COMMAND cp -r ${_AGD} ${_DMG}
-			COMMAND ln ${_VERB} -s /Applications ${_DMG}
+			COMMAND rm -rf "${_DMG}"
+			COMMAND mkdir ${_VERB} -p "${_DMG}"
+			COMMAND cp -r "${_AGD}" "${_DMG}"
+			COMMAND ln ${_VERB} -s /Applications "${_DMG}"
 			# generate dmg
 			${_cmd_gen_dmg}
 			COMMENT "${_comment}"