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

Merge commit 'e65c4ef077b746c05185c5aef81e1ad9839d66da'

Browse Source
This commit is contained in:
Ryan Pavlik
2011-03-28 14:14:17 -05:00
parent 59d36d9d49 e65c4ef077
commit c5a9394a5a
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/FileCopyTargets.cmake
View File

@@ -67,7 +67,7 @@ function(add_file_copy_target _target _dest)
COMMAND
${CMAKE_COMMAND}
ARGS -E copy "${fullpath}" "${_dest}"
MAIN_DEPENDENCY "${fn}"
MAIN_DEPENDENCY "${fullpath}"
VERBATIM
COMMENT "Copying ${fn} to ${absout}")
list(APPEND SOURCES "${fullpath}")

5
cmake/LuaTargets.cmake
View File

@@ -41,7 +41,7 @@ function(add_lua_target _target _dest)
if(TARGET luac)
set(LUA_TARGET_LUAC_EXECUTABLE luac)
else()
find_executable(LUA_TARGET_LUAC_EXECUTABLE
find_program(LUA_TARGET_LUAC_EXECUTABLE
NAMES
luac)
endif()
@@ -50,6 +50,7 @@ function(add_lua_target _target _dest)
if(NOT LUA_TARGET_LUAC_EXECUTABLE)
message(FATAL_ERROR "Can't find luac: please give LUA_TARGET_LUAC_EXECUTABLE a useful value - currently ${LUA_TARGET_LUAC_EXECUTABLE}")
endif()
mark_as_advanced(LUA_TARGET_LUAC_EXECUTABLE)
set(ALLFILES)
set(SOURCES)
@@ -75,7 +76,7 @@ function(add_lua_target _target _dest)
COMMAND
"${LUA_TARGET_LUAC_EXECUTABLE}"
ARGS -p "${fullpath}"
MAIN_DEPENDENCY "${fn}"
MAIN_DEPENDENCY "${fullpath}"
VERBATIM
COMMENT "Copying ${fn} to ${absout} and parsing...")
list(APPEND SOURCES "${fullpath}")