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

@@ -3,10 +3,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)
###
@@ -36,6 +36,6 @@ endif()
cuda_add_library(cutil ${TYPE} EXCLUDE_FROM_ALL ${SOURCES})
set(CUTIL_INCLUDE_DIRS "${CUTIL_ROOT_DIR}/inc" PARENT_SCOPE)
set(CUTIL_INCLUDE_DIRS "${CUTIL_ROOT_DIR}/inc" "${CUDA_INCLUDE_DIRS}" PARENT_SCOPE)
set(CUTIL_LIBRARIES cutil PARENT_SCOPE)