rik/libwiiuse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '7eb712f9de588e6fa8e227d1894c6ae7ed75b3f9'

Browse Source
This commit is contained in:
Ryan Pavlik
2011-02-18 11:09:21 -06:00
parent 7ab381fdce 7eb712f9de
commit fe8a54d486
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/CreateLaunchers.cmake
View File

@@ -228,7 +228,12 @@ macro(_launcher_create_target_launcher)
if(CMAKE_CONFIGURATION_TYPES) if(CMAKE_CONFIGURATION_TYPES)
# Multi-config generator - multiple launchers # Multi-config generator - multiple launchers
foreach(_config ${CMAKE_CONFIGURATION_TYPES}) 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" configure_file("${_launchermoddir}/targetlauncher.${_suffix}.in"
"${CMAKE_CURRENT_BINARY_DIR}/launch-${_targetname}-${_config}.${_suffix}" "${CMAKE_CURRENT_BINARY_DIR}/launch-${_targetname}-${_config}.${_suffix}"
@ONLY) @ONLY)

2
cmake/FindGDB.cmake
View File

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