From e65c4ef077b746c05185c5aef81e1ad9839d66da Mon Sep 17 00:00:00 2001
From: Ryan Pavlik <rpavlik@iastate.edu>
Date: Mon, 28 Mar 2011 14:14:17 -0500
Subject: [PATCH] Squashed 'cmake/' changes from 3ea43dc..b0d0a58

b0d0a58 Fix/improve use of luac
0469be6 Minor lua/filecopy tweak fixing source files outside of tree

git-subtree-dir: cmake
git-subtree-split: b0d0a584df1d408c83381652359c40d1c47765c8
---
 FileCopyTargets.cmake | 2 +-
 LuaTargets.cmake      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

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