Merge commit '6481cc3d7534a34435e88d343eb5f499001032a0'
This commit is contained in:
@@ -30,10 +30,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)
|
||||
|
||||
set(_HUMAN "cppdom")
|
||||
set(_HEADER cppdom/cppdom.h)
|
||||
@@ -90,7 +90,11 @@ if(DEFINED VRJUGGLER22_ROOT_DIR)
|
||||
mark_as_advanced(CPPDOM_ROOT_DIR)
|
||||
endif()
|
||||
if(NOT CPPDOM_ROOT_DIR)
|
||||
set(CPPDOM_ROOT_DIR "${VRJUGGLER22_ROOT_DIR}")
|
||||
if(VRJUGGLER22_ROOT_DIR)
|
||||
set(CPPDOM_ROOT_DIR "${VRJUGGLER22_ROOT_DIR}")
|
||||
elseif(VRJUGGLER30_ROOT_DIR)
|
||||
set(CPPDOM_ROOT_DIR "${VRJUGGLER30_ROOT_DIR}")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
set(_ROOT_DIR "${CPPDOM_ROOT_DIR}")
|
||||
|
||||
Reference in New Issue
Block a user