Update CMake modules.

Merge commit 'dd2c7e902aa095fd7844329e38bca7cd7c51e6d9' into osx-refactor_sync-mplus

Conflicts:
	cmake/FindWinHID.cmake
This commit is contained in:
Ryan Pavlik
2012-12-12 11:29:17 -06:00
62 changed files with 3035 additions and 302 deletions

View File

@@ -334,6 +334,20 @@ if(VRJUGGLER30_FOUND)
list(APPEND _plugin_dirs "${_libdir}/sonix-1.4/plugins/dbg")
list(APPEND _plugin_dirs "${_libdir}/sonix-1.4/plugins/opt")
endif()
# Find directories of JCCL plugins
if(EXISTS "${_libdir}/jccl/plugins")
list(APPEND _plugin_dirs "${_libdir}/jccl/plugins")
elseif(EXISTS "${_libdir}/jccl-1.4/plugins")
list(APPEND _plugin_dirs "${_libdir}/jccl-1.4/plugins")
endif()
# Find directories of VR Juggler plugins
if(EXISTS "${_libdir}/vrjuggler/plugins")
list(APPEND _plugin_dirs "${_libdir}/vrjuggler/plugins")
elseif(EXISTS "${_libdir}/vrjuggler-3.0/plugins")
list(APPEND _plugin_dirs "${_libdir}/vrjuggler-3.0/plugins")
endif()
endforeach()
# Grab the actual plugins
@@ -341,7 +355,13 @@ if(VRJUGGLER30_FOUND)
if(EXISTS "${_libdir}")
list(APPEND VRJUGGLER30_RUNTIME_LIBRARY_DIRS "${_libdir}")
file(GLOB _plugins "${_libdir}/*${CMAKE_SHARED_LIBRARY_SUFFIX}")
list(APPEND VRJUGGLER30_BUNDLE_PLUGINS ${_plugins})
foreach(_plugin ${_plugins})
if("${_plugin}" MATCHES "_d${CMAKE_SHARED_LIBRARY_SUFFIX}")
list(APPEND VRJUGGLER30_BUNDLE_PLUGINS_DEBUG ${_plugin})
else()
list(APPEND VRJUGGLER30_BUNDLE_PLUGINS ${_plugin})
endif()
endforeach()
endif()
endforeach()
@@ -391,19 +411,23 @@ function(install_vrjuggler30_data_files prefix)
install(FILES "${base}/calibration.table" DESTINATION "${DEST}")
endfunction()
function(install_vrjuggler30_plugins prefix varForFilenames)
set(DEST "${prefix}")
set(out)
foreach(plugin ${VRJUGGLER30_BUNDLE_PLUGINS})
macro(_vrjuggler30_plugin_install _VAR)
foreach(plugin ${${_VAR}})
get_filename_component(full "${plugin}" ABSOLUTE)
file(RELATIVE_PATH relloc "${VRJUGGLER30_VJ_BASE_DIR}" "${full}")
set(filedest "${DEST}/${relloc}")
get_filename_component(path "${filedest}" PATH)
list(APPEND out "${filedest}")
install(FILES "${full}" DESTINATION "${path}")
install(FILES "${full}" DESTINATION "${path}" ${ARGN})
endforeach()
endmacro()
function(install_vrjuggler30_plugins prefix varForFilenames)
set(DEST "${prefix}")
set(out)
_vrjuggler30_plugin_install(VRJUGGLER30_BUNDLE_PLUGINS)
_vrjuggler30_plugin_install(VRJUGGLER30_BUNDLE_PLUGINS_DEBUG CONFIGURATIONS DEBUG)
set(${varForFilenames} ${out} PARENT_SCOPE)
endfunction()