rik/libwiiuse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '23e7c6d8605e86164671fe381173ceed6705f111'

Browse Source
This commit is contained in:
Ryan Pavlik
2011-02-18 10:22:20 -06:00
parent e6b4879ddf 23e7c6d860
commit 392fa9eed7
20 changed files with 290 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
cmake/CreateLaunchers.cmake
View File

@@ -20,7 +20,7 @@
# [RUNTIME_LIBRARY_DIRS <dir...>] # [RUNTIME_LIBRARY_DIRS <dir...>]
# [WORKING_DIRECTORY <dir>] # [WORKING_DIRECTORY <dir>]
# [ENVIRONMENT <VAR=value> [<VAR=value>...]]) # [ENVIRONMENT <VAR=value> [<VAR=value>...]])
# - sets GENERIC_LAUNCHER_COMMAND amd GENERIC_LAUNCHER_FAIL_REGULAR_EXPRESSION # - sets GENERIC_LAUNCHER_COMMAND and GENERIC_LAUNCHER_FAIL_REGULAR_EXPRESSION
# #
# Requires these CMake modules: # Requires these CMake modules:
# ListFilter # ListFilter
@@ -64,18 +64,28 @@ macro(_launcher_system_settings)
# Find user and system name # Find user and system name
set(SYSTEM_NAME $ENV{USERDOMAIN}) set(SYSTEM_NAME $ENV{USERDOMAIN})
set(USER_NAME $ENV{USERNAME}) set(USER_NAME $ENV{USERNAME})
set(VCPROJ_TYPE vcproj)
if(MSVC100) set(USERFILE_EXTENSION ${SYSTEM_NAME}.${USER_NAME}.user)
set(LAUNCHER_LINESEP "&#x0A;")
if(MSVC10)
set(LAUNCHER_LINESEP "\n")
set(USERFILE_VC_VERSION 10.00) set(USERFILE_VC_VERSION 10.00)
set(USERFILE_EXTENSION user)
set(VCPROJ_TYPE vcxproj)
elseif(MSVC90) elseif(MSVC90)
set(USERFILE_VC_VERSION 9.00) set(USERFILE_VC_VERSION 9.00)
elseif(MSVC80) elseif(MSVC80)
set(USERFILE_VC_VERSION 8.00) set(USERFILE_VC_VERSION 8.00)
elseif(MSVC71) elseif(MSVC71)
set(USERFILE_VC_VERSION 7.10) set(USERFILE_VC_VERSION 7.10)
elseif(MSVC)
message(STATUS "MSVC but unrecognized version!")
endif()
if(BITS EQUAL 64)
set(USERFILE_PLATFORM x64)
else()
set(USERFILE_PLATFORM Win${BITS})
endif() endif()
set(USERFILE_PLATFORM Win${BITS})
set(_pathdelim ";") set(_pathdelim ";")
set(_suffix "cmd") set(_suffix "cmd")
else() else()
@@ -176,7 +186,7 @@ macro(_launcher_process_args)
set(USERFILE_ENV_COMMANDS) set(USERFILE_ENV_COMMANDS)
foreach(_arg "${RUNTIME_LIBRARIES_ENVIRONMENT}" ${ENVIRONMENT}) foreach(_arg "${RUNTIME_LIBRARIES_ENVIRONMENT}" ${ENVIRONMENT})
string(CONFIGURE string(CONFIGURE
"@USERFILE_ENVIRONMENT@&#x0A;@_arg@" "@USERFILE_ENVIRONMENT@@LAUNCHER_LINESEP@@_arg@"
USERFILE_ENVIRONMENT USERFILE_ENVIRONMENT
@ONLY) @ONLY)
string(CONFIGURE string(CONFIGURE
@@ -189,7 +199,7 @@ endmacro()
macro(_launcher_produce_vcproj_user) macro(_launcher_produce_vcproj_user)
if(MSVC) if(MSVC)
file(READ file(READ
"${_launchermoddir}/perconfig.vcproj.user.in" "${_launchermoddir}/perconfig.${VCPROJ_TYPE}.user.in"
_perconfig) _perconfig)
set(USERFILE_CONFIGSECTIONS) set(USERFILE_CONFIGSECTIONS)
foreach(USERFILE_CONFIGNAME ${CMAKE_CONFIGURATION_TYPES}) foreach(USERFILE_CONFIGNAME ${CMAKE_CONFIGURATION_TYPES})
@@ -207,8 +217,8 @@ macro(_launcher_produce_vcproj_user)
endforeach() endforeach()
configure_file("${_launchermoddir}/vcproj.user.in" configure_file("${_launchermoddir}/${VCPROJ_TYPE}.user.in"
${VCPROJNAME}.vcproj.${SYSTEM_NAME}.${USER_NAME}.user ${VCPROJNAME}.${VCPROJ_TYPE}.${USERFILE_EXTENSION}
@ONLY) @ONLY)
endif() endif()
@@ -244,9 +254,6 @@ function(create_default_target_launcher _targetname)
set(VCPROJNAME "${CMAKE_BINARY_DIR}/ALL_BUILD") set(VCPROJNAME "${CMAKE_BINARY_DIR}/ALL_BUILD")
_launcher_produce_vcproj_user() _launcher_produce_vcproj_user()
set(VCPROJNAME "${CMAKE_CURRENT_BINARY_DIR}/${_targetname}")
_launcher_produce_vcproj_user()
_launcher_create_target_launcher() _launcher_create_target_launcher()
endfunction() endfunction()

43
cmake/FindVRJuggler22.cmake
View File

@@ -250,13 +250,11 @@ if(VRJUGGLER22_FOUND)
set(_vrj22_base_dir "${_vrj22_base_dir}" CACHE INTERNAL "" FORCE) set(_vrj22_base_dir "${_vrj22_base_dir}" CACHE INTERNAL "" FORCE)
if(_vrj22_have_base_dir) if(_vrj22_have_base_dir)
file(GLOB
_poss_dirs
${VRJUGGLER22_VJ_BASE_DIR}/share/vrjuggler*/data/configFiles)
find_path(VRJUGGLER22_VJ_CFG_DIR find_path(VRJUGGLER22_VJ_CFG_DIR
standalone.jconf standalone.jconf
PATHS PATHS
${_poss_dirs} ${VRJUGGLER22_VJ_BASE_DIR}/share/vrjuggler-2.2/data/configFiles
${VRJUGGLER22_VJ_BASE_DIR}/share/vrjuggler/data/configFiles
NO_DEFAULT_PATH) NO_DEFAULT_PATH)
mark_as_advanced(VRJUGGLER22_VJ_CFG_DIR) mark_as_advanced(VRJUGGLER22_VJ_CFG_DIR)
endif() endif()
@@ -416,20 +414,19 @@ endfunction()
function(get_vrjuggler_bundle_sources _target_sources) function(get_vrjuggler_bundle_sources _target_sources)
if(APPLE) if(APPLE)
if(NOT MACOSX_PACKAGE_DIR) set(_bundledir "${VRJUGGLER22_VJ_CFG_DIR}/../bundle")
set(MACOSX_PACKAGE_DIR ${CMAKE_SOURCE_DIR}/cmake/package/macosx) get_filename_component(_bundledir "${_bundledir}" ABSOLUTE)
endif()
set(_vj_base_dir .) set(_vj_base_dir .)
set(_vj_data_dir ${vj_base_dir}/share/vrjuggler-2.2) set(_vj_data_dir ${vj_base_dir}/share/vrjuggler-2.2)
# Append Mac-specific sources to source list # Append Mac-specific sources to source list
set(_vj_bundle_src set(_vj_bundle_src
${MACOSX_PACKAGE_DIR}/Resources/vrjuggler.icns ${_bundledir}/vrjuggler.icns
${MACOSX_PACKAGE_DIR}/Resources/vrjuggler.plist ${_bundledir}/vrjuggler.plist
${MACOSX_PACKAGE_DIR}/Resources/en.lproj/MainMenu.nib/classes.nib ${_bundledir}/en.lproj/MainMenu.nib/classes.nib
${MACOSX_PACKAGE_DIR}/Resources/en.lproj/MainMenu.nib/info.nib ${_bundledir}/MainMenu.nib/info.nib
${MACOSX_PACKAGE_DIR}/Resources/en.lproj/MainMenu.nib/keyedobjects.nib) ${_bundledir}/MainMenu.nib/keyedobjects.nib)
message(STATUS "vjbundlesrc: ${_vj_bundle_src}") message(STATUS "vjbundlesrc: ${_vj_bundle_src}")
set(${_target_sources} set(${_target_sources}
@@ -438,22 +435,25 @@ function(get_vrjuggler_bundle_sources _target_sources)
PARENT_SCOPE) PARENT_SCOPE)
# Set destination of nib files # Set destination of nib files
set_source_files_properties(${MACOSX_PACKAGE_DIR}/Resources/en.lproj/MainMenu.nib/classes.nib set_source_files_properties(${_bundledir}/MainMenu.nib/classes.nib
${MACOSX_PACKAGE_DIR}/Resources/en.lproj/MainMenu.nib/info.nib ${_bundledir}/MainMenu.nib/info.nib
${MACOSX_PACKAGE_DIR}/Resources/en.lproj/MainMenu.nib/keyedobjects.nib ${_bundledir}/MainMenu.nib/keyedobjects.nib
PROPERTIES PROPERTIES
MACOSX_PACKAGE_LOCATION MACOSX_PACKAGE_LOCATION
Resources/en.lproj/MainMenu.nib/) Resources/en.lproj/MainMenu.nib/)
# Set destination of Resources # Set destination of Resources
set_source_files_properties(${MACOSX_PACKAGE_DIR}/Resources/vrjuggler.icns set_source_files_properties(${_bundledir}/vrjuggler.icns
${MACOSX_PACKAGE_DIR}/Resources/vrjuggler.plist ${_bundledir}/vrjuggler.plist
PROPERTIES PROPERTIES
MACOSX_PACKAGE_LOCATION MACOSX_PACKAGE_LOCATION
Resources/) Resources/)
endif() endif()
endfunction() endfunction()
get_filename_component(_vrjuggler22moddir
${CMAKE_CURRENT_LIST_FILE}
PATH)
function(fixup_vrjuggler_app_bundle function(fixup_vrjuggler_app_bundle
_target _target
_targetInstallDest _targetInstallDest
@@ -464,9 +464,8 @@ function(fixup_vrjuggler_app_bundle
return() return()
endif() endif()
if(NOT MACOSX_PACKAGE_DIR) set(PACKAGE_DIR ${_vrjuggler22moddir}/package)
set(MACOSX_PACKAGE_DIR ${CMAKE_SOURCE_DIR}/cmake/package/macosx) set(MACOSX_PACKAGE_DIR ${PACKAGE_DIR}/macosx)
endif()
set(TARGET_LOCATION set(TARGET_LOCATION
"${_targetInstallDest}/${_target}${CMAKE_EXECUTABLE_SUFFIX}") "${_targetInstallDest}/${_target}${CMAKE_EXECUTABLE_SUFFIX}")
@@ -476,8 +475,6 @@ function(fixup_vrjuggler_app_bundle
set_target_properties(${_target} set_target_properties(${_target}
PROPERTIES PROPERTIES
MACOSX_BUNDLE
true
MACOSX_BUNDLE_INFO_PLIST MACOSX_BUNDLE_INFO_PLIST
${MACOSX_PACKAGE_DIR}/VRJuggler22BundleInfo.plist.in ${MACOSX_PACKAGE_DIR}/VRJuggler22BundleInfo.plist.in
MACOSX_BUNDLE_ICON_FILE MACOSX_BUNDLE_ICON_FILE
@@ -498,7 +495,7 @@ function(fixup_vrjuggler_app_bundle
set(BUNDLE_LIBS ${_extralibs}) set(BUNDLE_LIBS ${_extralibs})
set(BUNDLE_LIB_DIRS "${VRJUGGLER22_VJ_BASE_DIR}" ${_libdirs}) set(BUNDLE_LIB_DIRS "${VRJUGGLER22_VJ_BASE_DIR}" ${_libdirs})
configure_file(${MACOSX_PACKAGE_DIR}/fixupbundle.cmake.in configure_file(${PACKAGE_DIR}/fixupbundle.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/${_target}-fixupbundle-juggler.cmake ${CMAKE_CURRENT_BINARY_DIR}/${_target}-fixupbundle-juggler.cmake
@ONLY) @ONLY)
install(SCRIPT install(SCRIPT

44
cmake/FindVRJuggler30.cmake
View File

@@ -247,13 +247,11 @@ if(VRJUGGLER30_FOUND)
set(_vrj30_base_dir "${_vrj30_base_dir}" CACHE INTERNAL "" FORCE) set(_vrj30_base_dir "${_vrj30_base_dir}" CACHE INTERNAL "" FORCE)
if(_vrj30_have_base_dir) if(_vrj30_have_base_dir)
file(GLOB
_poss_dirs
${VRJUGGLER30_VJ_BASE_DIR}/share/vrjuggler*/data/configFiles)
find_path(VRJUGGLER30_VJ_CFG_DIR find_path(VRJUGGLER30_VJ_CFG_DIR
standalone.jconf standalone.jconf
PATHS PATHS
${_poss_dirs} ${VRJUGGLER30_VJ_BASE_DIR}/share/vrjuggler-3.0/data/configFiles
${VRJUGGLER30_VJ_BASE_DIR}/share/vrjuggler/data/configFiles
NO_DEFAULT_PATH) NO_DEFAULT_PATH)
mark_as_advanced(VRJUGGLER30_VJ_CFG_DIR) mark_as_advanced(VRJUGGLER30_VJ_CFG_DIR)
endif() endif()
@@ -412,20 +410,19 @@ endfunction()
function(get_vrjuggler_bundle_sources _target_sources) function(get_vrjuggler_bundle_sources _target_sources)
if(APPLE) if(APPLE)
if(NOT MACOSX_PACKAGE_DIR) set(_bundledir "${VRJUGGLER30_VJ_CFG_DIR}/../bundle")
set(MACOSX_PACKAGE_DIR ${CMAKE_SOURCE_DIR}/cmake/package/macosx) get_filename_component(_bundledir "${_bundledir}" ABSOLUTE)
endif()
set(_vj_base_dir .) set(_vj_base_dir .)
set(_vj_data_dir ${vj_base_dir}/share/vrjuggler-3.0) set(_vj_data_dir ${vj_base_dir}/share/vrjuggler-3.0)
# Append Mac-specific sources to source list # Append Mac-specific sources to source list
set(_vj_bundle_src set(_vj_bundle_src
${MACOSX_PACKAGE_DIR}/Resources/vrjuggler.icns ${_bundledir}/vrjuggler.icns
${MACOSX_PACKAGE_DIR}/Resources/vrjuggler.plist ${_bundledir}/vrjuggler.plist
${MACOSX_PACKAGE_DIR}/Resources/en.lproj/MainMenu.nib/classes.nib ${_bundledir}/en.lproj/MainMenu.nib/classes.nib
${MACOSX_PACKAGE_DIR}/Resources/en.lproj/MainMenu.nib/info.nib ${_bundledir}/MainMenu.nib/info.nib
${MACOSX_PACKAGE_DIR}/Resources/en.lproj/MainMenu.nib/keyedobjects.nib) ${_bundledir}/MainMenu.nib/keyedobjects.nib)
message(STATUS "vjbundlesrc: ${_vj_bundle_src}") message(STATUS "vjbundlesrc: ${_vj_bundle_src}")
set(${_target_sources} set(${_target_sources}
@@ -434,22 +431,25 @@ function(get_vrjuggler_bundle_sources _target_sources)
PARENT_SCOPE) PARENT_SCOPE)
# Set destination of nib files # Set destination of nib files
set_source_files_properties(${MACOSX_PACKAGE_DIR}/Resources/en.lproj/MainMenu.nib/classes.nib set_source_files_properties(${_bundledir}/MainMenu.nib/classes.nib
${MACOSX_PACKAGE_DIR}/Resources/en.lproj/MainMenu.nib/info.nib ${_bundledir}/MainMenu.nib/info.nib
${MACOSX_PACKAGE_DIR}/Resources/en.lproj/MainMenu.nib/keyedobjects.nib ${_bundledir}/MainMenu.nib/keyedobjects.nib
PROPERTIES PROPERTIES
MACOSX_PACKAGE_LOCATION MACOSX_PACKAGE_LOCATION
Resources/en.lproj/MainMenu.nib/) Resources/en.lproj/MainMenu.nib/)
# Set destination of Resources # Set destination of Resources
set_source_files_properties(${MACOSX_PACKAGE_DIR}/Resources/vrjuggler.icns set_source_files_properties(${_bundledir}/vrjuggler.icns
${MACOSX_PACKAGE_DIR}/Resources/vrjuggler.plist ${_bundledir}/vrjuggler.plist
PROPERTIES PROPERTIES
MACOSX_PACKAGE_LOCATION MACOSX_PACKAGE_LOCATION
Resources/) Resources/)
endif() endif()
endfunction() endfunction()
get_filename_component(_vrjuggler30moddir
${CMAKE_CURRENT_LIST_FILE}
PATH)
function(fixup_vrjuggler_app_bundle function(fixup_vrjuggler_app_bundle
_target _target
_targetInstallDest _targetInstallDest
@@ -460,9 +460,9 @@ function(fixup_vrjuggler_app_bundle
return() return()
endif() endif()
if(NOT MACOSX_PACKAGE_DIR)
set(MACOSX_PACKAGE_DIR ${CMAKE_SOURCE_DIR}/cmake/package/macosx) set(PACKAGE_DIR ${_vrjuggler30moddir}/package)
endif() set(MACOSX_PACKAGE_DIR ${PACKAGE_DIR}/macosx)
set(TARGET_LOCATION set(TARGET_LOCATION
"${_targetInstallDest}/${_target}${CMAKE_EXECUTABLE_SUFFIX}") "${_targetInstallDest}/${_target}${CMAKE_EXECUTABLE_SUFFIX}")
@@ -472,8 +472,6 @@ function(fixup_vrjuggler_app_bundle
set_target_properties(${_target} set_target_properties(${_target}
PROPERTIES PROPERTIES
MACOSX_BUNDLE
true
MACOSX_BUNDLE_INFO_PLIST MACOSX_BUNDLE_INFO_PLIST
${MACOSX_PACKAGE_DIR}/VRJuggler30BundleInfo.plist.in ${MACOSX_PACKAGE_DIR}/VRJuggler30BundleInfo.plist.in
MACOSX_BUNDLE_ICON_FILE MACOSX_BUNDLE_ICON_FILE
@@ -494,7 +492,7 @@ function(fixup_vrjuggler_app_bundle
set(BUNDLE_LIBS ${_extralibs}) set(BUNDLE_LIBS ${_extralibs})
set(BUNDLE_LIB_DIRS "${VRJUGGLER30_VJ_BASE_DIR}" ${_libdirs}) set(BUNDLE_LIB_DIRS "${VRJUGGLER30_VJ_BASE_DIR}" ${_libdirs})
configure_file(${MACOSX_PACKAGE_DIR}/fixupbundle.cmake.in configure_file(${PACKAGE_DIR}/fixupbundle.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/${_target}-fixupbundle-juggler.cmake ${CMAKE_CURRENT_BINARY_DIR}/${_target}-fixupbundle-juggler.cmake
@ONLY) @ONLY)
install(SCRIPT install(SCRIPT

5
cmake/FindWinHID.cmake
View File

@@ -78,7 +78,10 @@ find_path(WINHID_INCLUDE_DIR
PATHS PATHS
"${WINHID_ROOT_DIR}" "${WINHID_ROOT_DIR}"
PATH_SUFFIXES PATH_SUFFIXES
inc/api) inc/api
inc/w2k
inc/wxp
inc/wnet)
find_path(WINHID_CRT_INCLUDE_DIR # otherwise you get weird compile errors find_path(WINHID_CRT_INCLUDE_DIR # otherwise you get weird compile errors
NAMES NAMES

75
cmake/Findcppunit.cmake Normal file
View File

@@ -0,0 +1,75 @@
# - try to find cppunit library
#
# Cache Variables: (probably not for direct use in your scripts)
# CPPUNIT_INCLUDE_DIR
# CPPUNIT_LIBRARY
#
# Non-cache variables you might use in your CMakeLists.txt:
# CPPUNIT_FOUND
# CPPUNIT_INCLUDE_DIRS
# CPPUNIT_LIBRARIES
#
# Requires these CMake modules:
# SelectLibraryConfigurations (included with CMake >= 2.8.0)
# FindPackageHandleStandardArgs (known included with CMake >=2.6.2)
#
# Original Author:
# 2009-2011 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
# http://academic.cleardefinition.com
# Iowa State University HCI Graduate Program/VRAC
#
# Copyright Iowa State University 2009-2011.
# 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)
set(CPPUNIT_ROOT_DIR
"${CPPUNIT_ROOT_DIR}"
CACHE
PATH
"Directory to search")
find_library(CPPUNIT_LIBRARY_RELEASE
NAMES
cppunit
HINTS
"${CPPUNIT_ROOT_DIR}")
find_library(CPPUNIT_LIBRARY_DEBUG
NAMES
cppunitd
HINTS
"${CPPUNIT_ROOT_DIR}")
include(SelectLibraryConfigurations)
select_library_configurations(CPPUNIT)
# Might want to look close to the library first for the includes.
get_filename_component(_libdir "${MYSIMPLEPACKAGE_LIBRARY}" PATH)
find_path(CPPUNIT_INCLUDE_DIR
NAMES
cppunit/TestCase.h
HINTS
"${_libdir}/.."
PATHS
"${CPPUNIT_ROOT_DIR}"
PATH_SUFFIXES
include/)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(cppunit
DEFAULT_MSG
CPPUNIT_LIBRARY
CPPUNIT_INCLUDE_DIR)
if(CPPUNIT_FOUND)
set(CPPUNIT_LIBRARIES ${CPPUNIT_LIBRARY} ${CMAKE_DL_LIBS})
set(CPPUNIT_INCLUDE_DIRS "${CPPUNIT_INCLUDE_DIR}")
mark_as_advanced(CPPUNIT_ROOT_DIR)
endif()
mark_as_advanced(CPPUNIT_INCLUDE_DIR
CPPUNIT_LIBRARY_RELEASE
CPPUNIT_LIBRARY_DEBUG)

3
cmake/GetGitRevisionDescription.cmake.in
View File

@@ -28,6 +28,3 @@ endif()
file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024) file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024)
string(STRIP "${HEAD_HASH}" HEAD_HASH) string(STRIP "${HEAD_HASH}" HEAD_HASH)
set(HEAD_HASH "${HEAD_CONTENTS}")

22
cmake/LuaTargets.cmake
View File

@@ -30,15 +30,26 @@ set(__add_lua YES)
include(FileCopyTargets) include(FileCopyTargets)
function(add_lua_target _target _dest) function(add_lua_target _target _dest)
if(NOT ARGN) if(NOT ARGN)
message(WARNING message(WARNING
"In add_lua_target call for target ${_target}, no source files were specified!") "In add_lua_target call for target ${_target}, no source files were specified!")
return() return()
endif() endif()
if(NOT LUA_TARGET_LUAC_EXECUTABLE) if(NOT LUA_TARGET_LUAC_EXECUTABLE)
set(LUA_TARGET_LUAC_EXECUTABLE luac) if(TARGET luac)
message(STATUS "luac target found, using that in add_lua_target")
set(LUA_TARGET_LUAC_EXECUTABLE luac)
else()
find_executable(LUA_TARGET_LUAC_EXECUTABLE
NAMES
luac)
endif()
endif()
if(NOT LUA_TARGET_LUAC_EXECUTABLE)
message(FATAL_ERROR "Can't find luac: please give LUA_TARGET_LUAC_EXECUTABLE a useful value - currently ${LUA_TARGET_LUAC_EXECUTABLE}")
endif() endif()
set(ALLFILES) set(ALLFILES)
@@ -70,7 +81,10 @@ function(add_lua_target _target _dest)
SOURCES ${ARGN} SOURCES ${ARGN}
DEPENDS ${ALLFILES}) DEPENDS ${ALLFILES})
if(TARGET "${LUA_TARGET_LUAC_EXECUTABLE}") if(TARGET "${LUA_TARGET_LUAC_EXECUTABLE}")
add_dependencies(${_target} ${LUA_TARGET_LUAC_EXECUTABLE}) get_property(_luac_imported TARGET "${LUA_TARGET_LUAC_EXECUTABLE}" PROPERTY IMPORTED)
if(NOT _luac_imported)
add_dependencies(${_target} ${LUA_TARGET_LUAC_EXECUTABLE})
endif()
endif() endif()
set_property(TARGET ${_target} PROPERTY FILE_COPY_TARGET YES) set_property(TARGET ${_target} PROPERTY FILE_COPY_TARGET YES)

149
cmake/MakeVRJugglerAppBundle.cmake
View File

@@ -1,149 +0,0 @@
# - A script to turn a VR Juggler app target into a Mac OS X bundle
#
# add_vrjuggler_bundle_sources(SOURCES_VAR_NAME) - run before add_executable
# finish_vrjuggler_bundle(TARGET_NAME LIB_DIRS) - run after add_executable
#
# 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(add_vrjuggler_bundle_sources _target_sources)
if(APPLE)
if(NOT MACOSX_PACKAGE_DIR)
set(MACOSX_PACKAGE_DIR ${CMAKE_SOURCE_DIR}/cmake/package/macosx)
endif()
set(_vj_base_dir .)
set(_vj_data_dir ${vj_base_dir}/share/vrjuggler-2.2)
# Append Mac-specific sources to source list
set(_vj_bundle_src
${MACOSX_PACKAGE_DIR}/Resources/vrjuggler.icns
${MACOSX_PACKAGE_DIR}/Resources/vrjuggler.plist
${MACOSX_PACKAGE_DIR}/Resources/en.lproj/MainMenu.nib/classes.nib
${MACOSX_PACKAGE_DIR}/Resources/en.lproj/MainMenu.nib/info.nib
${MACOSX_PACKAGE_DIR}/Resources/en.lproj/MainMenu.nib/keyedobjects.nib)
# Add and set destination of VR Juggler required files
# configFiles *.jconf
file(GLOB
_vj_config_files
${VRJ22_LIBRARY_DIR}/../share/vrjuggler-2.2/data/configFiles/*.jconf)
list(APPEND _vj_bundle_src ${_vj_config_files})
# definitions *.jdef
file(GLOB
_vj_defs_files
${VRJ22_LIBRARY_DIR}/../share/vrjuggler-2.2/data/definitions/*.jdef)
list(APPEND _vj_bundle_src ${_vj_defs_files})
# models *.flt
file(GLOB
_vj_model_files
${VRJ22_LIBRARY_DIR}/../share/vrjuggler-2.2/data/models/*.flt)
list(APPEND _vj_bundle_src ${_vj_model_files})
# sounds *.wav
file(GLOB
_vj_sound_files
${VRJ22_LIBRARY_DIR}/../share/vrjuggler-2.2/data/sounds/*.wav)
list(APPEND _vj_bundle_src ${_vj_sound_files})
# calibration.table - needed?
list(APPEND
_vj_bundle_src
${VRJ22_LIBRARY_DIR}/../share/vrjuggler-2.2/data/calibration.table)
message(STATUS "vjbundlesrc: ${_vj_bundle_src}")
set(${_target_sources}
${${_target_sources}}
${_vj_bundle_src}
PARENT_SCOPE)
# Set destination of nib files
set_source_files_properties(${MACOSX_PACKAGE_DIR}/Resources/en.lproj/MainMenu.nib/classes.nib
${MACOSX_PACKAGE_DIR}/Resources/en.lproj/MainMenu.nib/info.nib
${MACOSX_PACKAGE_DIR}/Resources/en.lproj/MainMenu.nib/keyedobjects.nib
PROPERTIES
MACOSX_PACKAGE_LOCATION
Resources/en.lproj/MainMenu.nib/)
# Set destination of Resources
set_source_files_properties(${MACOSX_PACKAGE_DIR}/Resources/vrjuggler.icns
${MACOSX_PACKAGE_DIR}/Resources/vrjuggler.plist
PROPERTIES
MACOSX_PACKAGE_LOCATION
Resources/)
set_source_files_properties(${_vj_config_files}
PROPERTIES
MACOSX_PACKAGE_LOCATION
${_vj_data_dir}/data/configFiles/)
set_source_files_properties(${_vj_defs_files}
PROPERTIES
MACOSX_PACKAGE_LOCATION
${_vj_data_dir}/data/definitions/)
set_source_files_properties(${_vj_model_files}
PROPERTIES
MACOSX_PACKAGE_LOCATION
${_vj_data_dir}/data/models/)
set_source_files_properties(${_vj_sound_files}
PROPERTIES
MACOSX_PACKAGE_LOCATION
${_vj_data_dir}/data/sounds/)
set_source_files_properties(${VRJ22_LIBRARY_DIR}/../share/vrjuggler-2.2/data/calibration.table
PROPERTIES
MACOSX_PACKAGE_LOCATION
${_vj_data_dir}/data/)
endif()
endfunction()
function(finish_vrjuggler_bundle _target _libdirs)
if(APPLE)
if(NOT MACOSX_PACKAGE_DIR)
set(MACOSX_PACKAGE_DIR ${CMAKE_SOURCE_DIR}/cmake/package/macosx)
endif()
set_target_properties(${_target}
PROPERTIES
MACOSX_BUNDLE
true
MACOSX_BUNDLE_INFO_PLIST
${MACOSX_PACKAGE_DIR}/VRJuggler22BundleInfo.plist.in
MACOSX_BUNDLE_ICON_FILE
vrjuggler.icns
MACOSX_BUNDLE_INFO_STRING
"${PROJECT_NAME} (VR Juggler Application) version ${CPACK_PACKAGE_VERSION}, created by ${CPACK_PACKAGE_VENDOR}"
MACOSX_BUNDLE_GUI_IDENTIFIER
org.vrjuggler.${PROJECT_NAME}
MACOSX_BUNDLE_SHORT_VERSION_STRING
${CPACK_PACKAGE_VERSION}
MACOSX_BUNDLE_BUNDLE_VERSION
${CPACK_PACKAGE_VERSION})
set(BUNDLE_LIBS
libboost_filesystem-1_34_1.dylib
libboost_signals-1_34_1.dylib)
set(BUNDLE_LIB_DIRS ${_libdirs})
configure_file(${MACOSX_PACKAGE_DIR}/fixupbundle.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/${_target}-fixupbundle.cmake
@ONLY)
add_custom_command(TARGET
${_target}
POST_BUILD
COMMAND
${CMAKE_COMMAND}
-P
${CMAKE_CURRENT_BINARY_DIR}/${_target}-fixupbundle.cmake
VERBATIM)
endif()
endfunction()

146
cmake/MakeVRJugglerAppBundle30.cmake
View File

@@ -1,146 +0,0 @@
# - A script to turn a VR Juggler app target into a Mac OS X bundle
#
# add_vrjuggler_bundle_sources(SOURCES_VAR_NAME) - run before add_executable
# finish_vrjuggler_bundle(TARGET_NAME LIB_DIRS) - run after add_executable
#
# Original Author:
# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
# http://academic.cleardefinition.com
# Iowa State University HCI Graduate Program/VRAC
# Updated for VR Juggler 3.0 by:
# Brandon Newendorp <brandon@newendorp.com>
function(add_vrjuggler_bundle_sources _target_sources)
if(APPLE)
if(NOT MACOSX_PACKAGE_DIR)
set(MACOSX_PACKAGE_DIR ${CMAKE_SOURCE_DIR}/cmake/package/macosx)
endif()
set(_vj_base_dir .)
set(_vj_data_dir ${vj_base_dir}/share/vrjuggler-3.0)
# Append Mac-specific sources to source list
set(_vj_bundle_src
${MACOSX_PACKAGE_DIR}/Resources/vrjuggler.icns
${MACOSX_PACKAGE_DIR}/Resources/vrjuggler.plist
${MACOSX_PACKAGE_DIR}/Resources/en.lproj/MainMenu.nib/classes.nib
${MACOSX_PACKAGE_DIR}/Resources/en.lproj/MainMenu.nib/info.nib
${MACOSX_PACKAGE_DIR}/Resources/en.lproj/MainMenu.nib/keyedobjects.nib)
# Add and set destination of VR Juggler required files
# configFiles *.jconf
file(GLOB
_vj_config_files
${VRJ30_LIBRARY_DIR}/../share/vrjuggler-3.0/data/configFiles/*.jconf)
list(APPEND _vj_bundle_src ${_vj_config_files})
# definitions *.jdef
file(GLOB
_vj_defs_files
${VRJ30_LIBRARY_DIR}/../share/vrjuggler-3.0/data/definitions/*.jdef)
list(APPEND _vj_bundle_src ${_vj_defs_files})
# models *.flt
file(GLOB
_vj_model_files
${VRJ30_LIBRARY_DIR}/../share/vrjuggler-3.0/data/models/*.flt)
list(APPEND _vj_bundle_src ${_vj_model_files})
# sounds *.wav
file(GLOB
_vj_sound_files
${VRJ30_LIBRARY_DIR}/../share/vrjuggler-3.0/data/sounds/*.wav)
list(APPEND _vj_bundle_src ${_vj_sound_files})
# calibration.table - needed?
list(APPEND
_vj_bundle_src
${VRJ30_LIBRARY_DIR}/../share/vrjuggler-3.0/data/calibration.table)
message(STATUS "vjbundlesrc: ${_vj_bundle_src}")
set(${_target_sources}
${${_target_sources}}
${_vj_bundle_src}
PARENT_SCOPE)
# Set destination of nib files
set_source_files_properties(${MACOSX_PACKAGE_DIR}/Resources/en.lproj/MainMenu.nib/classes.nib
${MACOSX_PACKAGE_DIR}/Resources/en.lproj/MainMenu.nib/info.nib
${MACOSX_PACKAGE_DIR}/Resources/en.lproj/MainMenu.nib/keyedobjects.nib
PROPERTIES
MACOSX_PACKAGE_LOCATION
Resources/en.lproj/MainMenu.nib/)
# Set destination of Resources
set_source_files_properties(${MACOSX_PACKAGE_DIR}/Resources/vrjuggler.icns
${MACOSX_PACKAGE_DIR}/Resources/vrjuggler.plist
PROPERTIES
MACOSX_PACKAGE_LOCATION
Resources/)
set_source_files_properties(${_vj_config_files}
PROPERTIES
MACOSX_PACKAGE_LOCATION
${_vj_data_dir}/data/configFiles/)
set_source_files_properties(${_vj_defs_files}
PROPERTIES
MACOSX_PACKAGE_LOCATION
${_vj_data_dir}/data/definitions/)
set_source_files_properties(${_vj_model_files}
PROPERTIES
MACOSX_PACKAGE_LOCATION
${_vj_data_dir}/data/models/)
set_source_files_properties(${_vj_sound_files}
PROPERTIES
MACOSX_PACKAGE_LOCATION
${_vj_data_dir}/data/sounds/)
set_source_files_properties(${VRJ30_LIBRARY_DIR}/../share/vrjuggler-3.0/data/calibration.table
PROPERTIES
MACOSX_PACKAGE_LOCATION
${_vj_data_dir}/data/)
endif()
endfunction()
function(finish_vrjuggler_bundle _target _libdirs)
if(APPLE)
if(NOT MACOSX_PACKAGE_DIR)
set(MACOSX_PACKAGE_DIR ${CMAKE_SOURCE_DIR}/cmake/package/macosx)
endif()
set_target_properties(${_target}
PROPERTIES
MACOSX_BUNDLE
true
MACOSX_BUNDLE_INFO_PLIST
${MACOSX_PACKAGE_DIR}/VRJuggler30BundleInfo.plist.in
MACOSX_BUNDLE_ICON_FILE
vrjuggler.icns
MACOSX_BUNDLE_INFO_STRING
"${PROJECT_NAME} (VR Juggler Application) version ${CPACK_PACKAGE_VERSION}, created by ${CPACK_PACKAGE_VENDOR}"
MACOSX_BUNDLE_GUI_IDENTIFIER
org.vrjuggler.${PROJECT_NAME}
MACOSX_BUNDLE_SHORT_VERSION_STRING
${CPACK_PACKAGE_VERSION}
MACOSX_BUNDLE_BUNDLE_VERSION
${CPACK_PACKAGE_VERSION})
set(BUNDLE_LIBS
libboost_filesystem-mt.dylib
libboost_signals-mt.dylib)
set(BUNDLE_LIB_DIRS ${_libdirs})
configure_file(${MACOSX_PACKAGE_DIR}/fixupbundle.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/${_target}-fixupbundle.cmake
@ONLY)
add_custom_command(TARGET
${_target}
POST_BUILD
COMMAND
${CMAKE_COMMAND}
-P
${CMAKE_CURRENT_BINARY_DIR}/${_target}-fixupbundle.cmake
VERBATIM)
endif()
endfunction()

68
cmake/cmake-2.9.0-modules/from-ITK-3.18.0/FindFFTW.cmake Normal file
View File

@@ -0,0 +1,68 @@
## FFTW can be compiled and subsequently linked against
## various data types.
## There is a single set of include files, and then muttiple libraries,
## One for each type. I.e. libfftw.a-->double, libfftwf.a-->float
## The following logic belongs in the individual package
## MARK_AS_ADVANCED(USE_FFTWD)
## OPTION(USE_FFTWD "Use double precision FFTW if found" ON)
## MARK_AS_ADVANCED(USE_FFTWF)
## OPTION(USE_FFTWF "Use single precision FFTW if found" ON)
IF(USE_FFTWD OR USE_FFTWF)
SET(FFTW_INC_SEARCHPATH
/sw/include
/usr/include
/usr/local/include
/usr/include/fftw
/usr/local/include/fftw
)
FIND_PATH(FFTW_INCLUDE_PATH fftw3.h ${FFTW_INC_SEARCHPATH})
IF(FFTW_INCLUDE_PATH)
SET(FFTW_INCLUDE ${FFTW_INCLUDE_PATH})
ENDIF (FFTW_INCLUDE_PATH)
IF(FFTW_INCLUDE)
INCLUDE_DIRECTORIES( ${FFTW_INCLUDE})
ENDIF(FFTW_INCLUDE)
GET_FILENAME_COMPONENT(FFTW_INSTALL_BASE_PATH ${FFTW_INCLUDE_PATH} PATH)
SET(FFTW_LIB_SEARCHPATH
${FFTW_INSTALL_BASE_PATH}/lib
/usr/lib/fftw
/usr/local/lib/fftw
)
IF(USE_FFTWD)
MARK_AS_ADVANCED(FFTWD_LIB)
# OPTION(FFTWD_LIB "The full path to the fftw3 library (including the library)" )
FIND_LIBRARY(FFTWD_LIB fftw3 ${FFTW_LIB_SEARCHPATH}) #Double Precision Lib
FIND_LIBRARY(FFTWD_THREADS_LIB fftw3_threads ${FFTW_LIB_SEARCHPATH}) #Double Precision Lib only if compiled with threads support
IF(FFTWD_LIB)
SET(FFTWD_FOUND 1)
IF(FFTWD_THREADS_LIB)
SET(FFTWD_LIB ${FFTWD_LIB} ${FFTWD_THREADS_LIB} )
ENDIF(FFTWD_THREADS_LIB)
ENDIF(FFTWD_LIB)
ENDIF(USE_FFTWD)
IF(USE_FFTWF)
MARK_AS_ADVANCED(FFTWF_LIB)
# OPTION(FFTWF_LIB "The full path to the fftw3f library (including the library)" )
FIND_LIBRARY(FFTWF_LIB fftw3f ${FFTW_LIB_SEARCHPATH}) #Single Precision Lib
FIND_LIBRARY(FFTWF_THREADS_LIB fftw3f_threads ${FFTW_LIB_SEARCHPATH}) #Single Precision Lib only if compiled with threads support
IF(FFTWF_LIB)
SET(FFTWF_FOUND 1)
IF(FFTWF_THREADS_LIB)
SET(FFTWF_LIB ${FFTWF_LIB} ${FFTWF_THREADS_LIB} )
ENDIF(FFTWF_THREADS_LIB)
ENDIF(FFTWF_LIB)
ENDIF(USE_FFTWF)
ENDIF(USE_FFTWD OR USE_FFTWF)

7
cmake/launcher-templates/perconfig.vcxproj.user.in Normal file
View File

@@ -0,0 +1,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='@USERFILE_CONFIGNAME@|@USERFILE_PLATFORM@'">
<LocalDebuggerEnvironment>@USERFILE_ENVIRONMENT@</LocalDebuggerEnvironment>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
<LocalDebuggerCommand>${USERFILE_@USERFILE_CONFIGNAME@_COMMAND}</LocalDebuggerCommand>
<LocalDebuggerCommandArguments>@USERFILE_COMMAND_ARGUMENTS@</LocalDebuggerCommandArguments>
<LocalDebuggerWorkingDirectory>@USERFILE_WORKING_DIRECTORY@</LocalDebuggerWorkingDirectory>
</PropertyGroup>

4
cmake/launcher-templates/vcxproj.user.in Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
@USERFILE_CONFIGSECTIONS@
</Project>

37
cmake/module-help.html
View File

File diff suppressed because one or more lines are too long

70
cmake/module-help.txt
View File

@@ -470,7 +470,7 @@ a few.
[RUNTIME_LIBRARY_DIRS <dir...>] [RUNTIME_LIBRARY_DIRS <dir...>]
[WORKING_DIRECTORY <dir>] [WORKING_DIRECTORY <dir>]
[ENVIRONMENT <VAR=value> [<VAR=value>...]]) [ENVIRONMENT <VAR=value> [<VAR=value>...]])
- sets GENERIC_LAUNCHER_COMMAND amd GENERIC_LAUNCHER_FAIL_REGULAR_EXPRESSION - sets GENERIC_LAUNCHER_COMMAND and GENERIC_LAUNCHER_FAIL_REGULAR_EXPRESSION
@@ -2658,6 +2658,41 @@ a few.
Boost Software License, Version 1.0. (See accompanying file Boost Software License, Version 1.0. (See accompanying file
LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
Findcppunit
try to find cppunit library
Cache Variables: (probably not for direct use in your scripts)
CPPUNIT_INCLUDE_DIR
CPPUNIT_LIBRARY
Non-cache variables you might use in your CMakeLists.txt:
CPPUNIT_FOUND
CPPUNIT_INCLUDE_DIRS
CPPUNIT_LIBRARIES
Requires these CMake modules:
SelectLibraryConfigurations (included with CMake >= 2.8.0)
FindPackageHandleStandardArgs (known included with CMake >=2.6.2)
Original Author: 2009-2011 Ryan Pavlik <rpavlik@iastate.edu>
<abiryan@ryand.net> http://academic.cleardefinition.com Iowa State
University HCI Graduate Program/VRAC
Copyright Iowa State University 2009-2011. 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)
Findcutil Findcutil
find NVIDIA CUDA and source for the cutil library, building cutil if find NVIDIA CUDA and source for the cutil library, building cutil if
needed. needed.
@@ -3183,39 +3218,6 @@ a few.
Boost Software License, Version 1.0. (See accompanying file Boost Software License, Version 1.0. (See accompanying file
LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
MakeVRJugglerAppBundle
A script to turn a VR Juggler app target into a Mac OS X bundle
add_vrjuggler_bundle_sources(SOURCES_VAR_NAME) - run before add_executable
finish_vrjuggler_bundle(TARGET_NAME LIB_DIRS) - run after add_executable
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)
MakeVRJugglerAppBundle30
A script to turn a VR Juggler app target into a Mac OS X bundle
add_vrjuggler_bundle_sources(SOURCES_VAR_NAME) - run before add_executable
finish_vrjuggler_bundle(TARGET_NAME LIB_DIRS) - run after add_executable
Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu>
<abiryan@ryand.net> http://academic.cleardefinition.com Iowa State
University HCI Graduate Program/VRAC Updated for VR Juggler 3.0 by:
Brandon Newendorp <brandon@newendorp.com>
OptionRequires OptionRequires
Add an option that depends on one or more variables being true. Add an option that depends on one or more variables being true.

0
cmake/package/macosx/fixupbundle.cmake.in → cmake/package/fixupbundle.cmake.in
View File

4
cmake/package/macosx/Resources/en.lproj/MainMenu.nib/classes.nib generated
View File

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

23
cmake/package/macosx/Resources/en.lproj/MainMenu.nib/info.nib generated
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>

BIN
cmake/package/macosx/Resources/en.lproj/MainMenu.nib/keyedobjects.nib generated
View File

Binary file not shown.

BIN
cmake/package/macosx/Resources/vrjuggler.icns
View File

Binary file not shown.

10
cmake/package/macosx/Resources/vrjuggler.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>