diff --git a/cmake/FileCopyTargets.cmake b/cmake/FileCopyTargets.cmake index fe0251f..d92df16 100644 --- a/cmake/FileCopyTargets.cmake +++ b/cmake/FileCopyTargets.cmake @@ -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}") diff --git a/cmake/LuaTargets.cmake b/cmake/LuaTargets.cmake index 5abbc46..e5532a2 100644 --- a/cmake/LuaTargets.cmake +++ b/cmake/LuaTargets.cmake @@ -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}")