Merge commit '23e7c6d8605e86164671fe381173ceed6705f111'

This commit is contained in:
Ryan Pavlik
2011-02-18 10:22:20 -06:00
20 changed files with 290 additions and 451 deletions

View File

@@ -1,4 +0,0 @@
{
IBClasses = ({CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; });
IBVersion = 1;
}

View File

@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>94 80 356 240 0 0 1280 832 </string>
<key>IBEditorPositions</key>
<dict>
<key>29</key>
<string>501 350 260 44 0 0 1280 832 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
<key>IBOldestOS</key>
<integer>3</integer>
<key>IBOpenObjects</key>
<array>
<integer>29</integer>
</array>
<key>IBSystem Version</key>
<string>8P135</string>
</dict>
</plist>

View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>VRJConfigHandling</key>
<false/>
<key>VRJDelegateClass</key>
<string>VRJBasicDelegate</string>
</dict>
</plist>

View File

@@ -1,56 +0,0 @@
# - Configurable script to fix up a VR Juggler bundle
#
# Original Author:
# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
# http://academic.cleardefinition.com
# Iowa State University HCI Graduate Program/VRAC
#
# 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)
function(gp_resolve_item_override _context _item _exepath _dirs _resolved_item _resolved)
if(NOT ${_resolved})
set(ri "ri-NOTFOUND")
if("${_item}" MATCHES "@executable_path")
get_filename_component(itemname "${_item}" NAME)
message(STATUS "Was incompletely embedded, now looking for ${itemname}")
find_file(ri "${itemname}" ${_exepath} ${_dirs} NO_DEFAULT_PATH)
find_file(ri "${itemname}" ${_exepath} ${_dirs} /usr/lib)
if(ri)
get_filename_component(ri "${ri}" REALPATH)
message(STATUS "override info: 'find_file' on filename '${itemname} in exepath/dirs (${ri})")
set(${_resolved} 1 PARENT_SCOPE)
set(${_resolved_item} "${ri}" PARENT_SCOPE)
set(ri "ri-NOTFOUND")
endif()
endif()
endif()
endfunction()
set(CMAKE_MODULE_PATH @CMAKE_MODULE_PATH@)
include(BundleUtilities)
set(IS_XCODE @IS_XCODE@)
if(IS_XCODE)
set(APP "$ENV{TARGET_BUILD_DIR}/@_target@.app")
else()
set(APP "@TARGET_LOCATION@")
endif()
#set(APP "@_target@")
set(BUNDLE_LIBS_INPUT "@BUNDLE_LIBS@")
foreach(lib ${BUNDLE_LIBS_INPUT})
if(IS_ABSOLUTE "${lib}")
list(APPEND BUNDLE_LIBS "${lib}")
message(STATUS " ${lib}")
else()
message(STATUS "* ${CMAKE_INSTALL_PREFIX}/${lib}")
list(APPEND BUNDLE_LIBS "${CMAKE_INSTALL_PREFIX}/${lib}")
endif()
endforeach()
fixup_bundle("${CMAKE_INSTALL_PREFIX}/${APP}" "${BUNDLE_LIBS}" "@BUNDLE_LIB_DIRS@")