diff --git a/cmake/macros/CompileGResources.cmake b/cmake/macros/CompileGResources.cmake index 3f60ac7a42..48963eb6eb 100644 --- a/cmake/macros/CompileGResources.cmake +++ b/cmake/macros/CompileGResources.cmake @@ -150,7 +150,7 @@ function(COMPILE_GRESOURCES output xml_out) # Generate gresources XML target. list(APPEND CG_CMAKE_SCRIPT_ARGS "-D") - list(APPEND CG_CMAKE_SCRIPT_ARGS "GXML_OUTPUT=${Q}${CG_XML_FILE_PATH}${Q}") + list(APPEND CG_CMAKE_SCRIPT_ARGS "GXML_OUTPUT=${CG_XML_FILE_PATH}") if(CG_ARG_COMPRESS_ALL) list(APPEND CG_CMAKE_SCRIPT_ARGS "-D") list(APPEND CG_CMAKE_SCRIPT_ARGS "GXML_COMPRESS_ALL=True") @@ -182,7 +182,7 @@ function(COMPILE_GRESOURCES output xml_out) "GXML_RESOURCES=${Q}${CG_ARG_RESOURCES}${Q}") list(APPEND CG_CMAKE_SCRIPT_ARGS "-P") list(APPEND CG_CMAKE_SCRIPT_ARGS - "${Q}${GCR_CMAKE_MACRO_DIR}/BuildTargetScript.cmake${Q}") + "${GCR_CMAKE_MACRO_DIR}/BuildTargetScript.cmake") get_filename_component(CG_XML_FILE_PATH_ONLY_NAME "${CG_XML_FILE_PATH}" NAME) diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index b2d9163e97..a93291c0c2 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -1151,8 +1151,8 @@ endif() if(NOT DISABLE_SETCAP) if(PACKAGE_MODE) - install(CODE "execute_process(COMMAND /bin/bash -c \"echo 'Enabling networking capability on Linux...';set -x; [ -f ${CMAKE_INSTALL_FULL_BINDIR}/${Output} ] && sudo setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' ${CMAKE_INSTALL_FULL_BINDIR}/${Output}; set +x\")") + install(CODE "execute_process(COMMAND /bin/bash -c \"echo 'Enabling networking capability on Linux...';set -x; [ -f '${CMAKE_INSTALL_FULL_BINDIR}/${Output}' ] && sudo setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' '${CMAKE_INSTALL_FULL_BINDIR}/${Output}'; set +x\")") else() - install(CODE "execute_process(COMMAND /bin/bash -c \"echo 'Enabling networking capability on Linux...';set -x; [ -f ${CMAKE_SOURCE_DIR}/bin/${Output} ] && sudo setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' ${CMAKE_SOURCE_DIR}/bin/${Output}; set +x\")") + install(CODE "execute_process(COMMAND /bin/bash -c \"echo 'Enabling networking capability on Linux...';set -x; [ -f '${CMAKE_SOURCE_DIR}/bin/${Output}' ] && sudo setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' '${CMAKE_SOURCE_DIR}/bin/${Output}'; set +x\")") endif() endif()