Squashed 'cmake/' changes from de83fed..3ea43dc

3ea43dc Fix program files osg search
14e987f Fix lua and file copy targets

git-subtree-dir: cmake
git-subtree-split: 3ea43dc726d289f72f4fc4c35b8d8acc47b17ab0

FileCopyTargets.cmake

@@ -47,29 +47,36 @@ function(add_file_copy_target _target _dest)
 	endif()
 
 	set(ALLFILES)
+	set(SOURCES)
 	foreach(fn ${ARGN})
+		# Produce an absolute path to the input file
 		if(IS_ABSOLUTE "${fn}")
-			set(fullpath "${fn}")
+			get_filename_component(fullpath "${fn}" ABSOLUTE)
 			get_filename_component(fn "${fn}" NAME)
 		else()
 			get_filename_component(fullpath "${CMAKE_CURRENT_SOURCE_DIR}/${fn}" ABSOLUTE)
 		endif()
-		add_custom_command(OUTPUT "${_dest}/${fn}"
+
+		# Clean up output file name
+		get_filename_component(absout "${_dest}/${fn}" ABSOLUTE)
+
+		add_custom_command(OUTPUT "${absout}"
 			COMMAND
 			${CMAKE_COMMAND}
 			ARGS -E make_directory "${_dest}"
 			COMMAND
 			${CMAKE_COMMAND}
 			ARGS -E copy "${fullpath}" "${_dest}"
-				WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+			MAIN_DEPENDENCY "${fn}"
-				DEPENDS "${fullpath}"
+			VERBATIM
-				COMMENT "Copying ${fullpath} to ${_dest}/${fn}")
+			COMMENT "Copying ${fn} to ${absout}")
-		list(APPEND ALLFILES "${_dest}/${fn}")
+		list(APPEND SOURCES "${fullpath}")
+		list(APPEND ALLFILES "${absout}")
 	endforeach()
 
 	# Custom target depending on all the file copy commands
 	add_custom_target(${_target}
-		SOURCES ${ARGN}
+		SOURCES ${SOURCES}
 		DEPENDS ${ALLFILES})
 
 	set_property(TARGET ${_target} PROPERTY FILE_COPY_TARGET YES)

LuaTargets.cmake

@@ -39,7 +39,6 @@ function(add_lua_target _target _dest)
 
 	if(NOT LUA_TARGET_LUAC_EXECUTABLE)
 		if(TARGET luac)
-			message(STATUS "luac target found, using that in add_lua_target")
 			set(LUA_TARGET_LUAC_EXECUTABLE luac)
 		else()
 			find_executable(LUA_TARGET_LUAC_EXECUTABLE
@@ -53,14 +52,20 @@ function(add_lua_target _target _dest)
 	endif()
 
 	set(ALLFILES)
+	set(SOURCES)
 	foreach(fn ${ARGN})
+		# Produce an absolute path to the input file
 		if(IS_ABSOLUTE "${fn}")
-			set(fullpath "${fn}")
+			get_filename_component(fullpath "${fn}" ABSOLUTE)
 			get_filename_component(fn "${fn}" NAME)
 		else()
 			get_filename_component(fullpath "${CMAKE_CURRENT_SOURCE_DIR}/${fn}" ABSOLUTE)
 		endif()
-		add_custom_command(OUTPUT "${_dest}/${fn}"
+
+		# Clean up output file name
+		get_filename_component(absout "${_dest}/${fn}" ABSOLUTE)
+
+		add_custom_command(OUTPUT "${absout}"
 			COMMAND
 			${CMAKE_COMMAND}
 			ARGS -E make_directory "${_dest}"
@@ -70,15 +75,16 @@ function(add_lua_target _target _dest)
 			COMMAND
 			"${LUA_TARGET_LUAC_EXECUTABLE}"
 			ARGS -p "${fullpath}"
-				WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+			MAIN_DEPENDENCY "${fn}"
-				DEPENDS "${fullpath}"
+			VERBATIM
-				COMMENT "Copying ${fullpath} to ${_dest}/${fn} and parsing...")
+			COMMENT "Copying ${fn} to ${absout} and parsing...")
-		list(APPEND ALLFILES "${_dest}/${fn}")
+		list(APPEND SOURCES "${fullpath}")
+		list(APPEND ALLFILES "${absout}")
 	endforeach()
 
 	# Custom target depending on all the file copy commands
 	add_custom_target(${_target}
-		SOURCES ${ARGN}
+		SOURCES ${SOURCES}
 		DEPENDS ${ALLFILES})
 	if(TARGET "${LUA_TARGET_LUAC_EXECUTABLE}")
 		get_property(_luac_imported TARGET "${LUA_TARGET_LUAC_EXECUTABLE}" PROPERTY IMPORTED)

SearchProgramFilesForOpenSceneGraph.cmake

@@ -33,9 +33,11 @@ if(WIN32)
 		elseif(MSVC90)
 			list_filter_out(_osgpaths "[vV][cC]8" ${_osgpaths})
 		endif()
+		if(_osgpaths)
 			list(SORT _osgpaths)
 			list(REVERSE _osgpaths)
 		endif()
+	endif()
 else()
 	prefix_list_glob(_osgpaths "/OpenSceneGraph*" /usr /usr/local /opt)
 	if(_osgpaths)