From 7eb712f9de588e6fa8e227d1894c6ae7ed75b3f9 Mon Sep 17 00:00:00 2001
From: Ryan Pavlik <rpavlik@iastate.edu>
Date: Fri, 18 Feb 2011 11:09:21 -0600
Subject: [PATCH] Squashed 'cmake/' changes from 6de4a61..de83fed

de83fed Fix findgdb (and thus launchers) on macosx: use cmake regex
ee5dd06 Fix launchers for non-msvc multi-config generators

git-subtree-dir: cmake
git-subtree-split: de83fed87b68cb6342f31dc17dc650a1edb8f648
---
 CreateLaunchers.cmake | 7 ++++++-
 FindGDB.cmake         | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CreateLaunchers.cmake b/CreateLaunchers.cmake
index c54826d..0f3f5b3 100644
--- a/CreateLaunchers.cmake
+++ b/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)
diff --git a/FindGDB.cmake b/FindGDB.cmake
index 519ba33..a5f743d 100644
--- a/FindGDB.cmake
+++ b/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