Merge commit '6481cc3d7534a34435e88d343eb5f499001032a0'

This commit is contained in:
Ryan Pavlik
2011-02-01 10:29:35 -06:00
136 changed files with 8269 additions and 421 deletions

View File

@@ -57,10 +57,10 @@
# http://academic.cleardefinition.com
# Iowa State University HCI Graduate Program/VRAC
#
# Copyright Iowa State University 2009-2010
# Copyright Iowa State University 2009-2010.
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)
# (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)
include(CleanLibraryList)
include(CleanDirectoryList)
@@ -309,9 +309,6 @@ if(VRJUGGLER22_FOUND)
set(VRJUGGLER22_CXX_FLAGS
"${VRJUGGLER22_CXX_FLAGS} ${CPPDOM_CXX_FLAGS}")
list(APPEND VRJUGGLER22_DEFINITIONS
"-DJUGGLER_DEBUG")
set(_VRJUGGLER22_SEARCH_COMPONENTS
"${VRJUGGLER22_REQUESTED_COMPONENTS}"
CACHE