Merge commit '7eb712f9de588e6fa8e227d1894c6ae7ed75b3f9'

2011-02-18 11:09:21 -06:00
parent 7ab381fdce 7eb712f9de
commit fe8a54d486
2 changed files with 7 additions and 2 deletions
--- a/cmake/CreateLaunchers.cmake
+++ b/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)