Merge commit '7eb712f9de588e6fa8e227d1894c6ae7ed75b3f9'

cmake/CreateLaunchers.cmake

@@ -228,7 +228,12 @@ macro(_launcher_create_target_launcher)
 	if(CMAKE_CONFIGURATION_TYPES)
 		# Multi-config generator - multiple launchers
 		foreach(_config ${CMAKE_CONFIGURATION_TYPES})
-			set(USERFILE_COMMAND "${USERFILE_${_config}_COMMAND}")
+			get_target_property(USERFILE_${_config}_COMMAND
+				${_targetname}
+				LOCATION_${_config})
+			file(TO_NATIVE_PATH
+				"${USERFILE_${_config}_COMMAND}"
+				USERFILE_COMMAND)
 			configure_file("${_launchermoddir}/targetlauncher.${_suffix}.in"
 				"${CMAKE_CURRENT_BINARY_DIR}/launch-${_targetname}-${_config}.${_suffix}"
 				@ONLY)

cmake/FindGDB.cmake

@@ -38,9 +38,9 @@ find_program(GDB_COMMAND
 if(GDB_COMMAND)
 	execute_process(COMMAND gdb --version
 		COMMAND head -n 1
-		COMMAND sed -r "s/[^0-9]*([0-9]+[0-9.]*).*/\\1/"
 		OUTPUT_VARIABLE GDB_VERSION
 		OUTPUT_STRIP_TRAILING_WHITESPACE)
+	string(REGEX REPLACE "[^0-9]*([0-9]+[0-9.]*).*" "\\1" GDB_VERSION "${GDB_VERSION}")
 endif()
 
 # handle the QUIETLY and REQUIRED arguments and set xxx_FOUND to TRUE if