From 01138739e0c50feaa922026295ebb62602b61447 Mon Sep 17 00:00:00 2001 From: Rylie Pavlik Date: Thu, 3 Sep 2026 10:04:46 -0500 Subject: [PATCH 1/3] Update CMake modules --- cmake-local/CMakeBoostHelper.cmake | 2 +- cmake/.gitattributes | 8 + cmake/AboutTheseModules.cmake | 7 +- cmake/BoostTestTargets.cmake | 15 +- cmake/BoostTestTargetsDynamic.h | 9 + cmake/BoostTestTargetsIncluded.h | 9 + cmake/BoostTestTargetsStatic.h | 9 + cmake/BundleOSGPlugins.cmake | 9 +- cmake/BundleOSGRuntime.cmake | 9 +- cmake/BundleVRJ22Runtime.cmake | 9 +- cmake/BundleVRJ30Runtime.cmake | 13 +- cmake/CheckMacHIDAPI.cmake | 9 +- cmake/CheckMacHIDAPI.cpp | 6 +- cmake/CheckVersion.cmake | 9 +- cmake/CleanDirectoryList.cmake | 9 +- cmake/CleanLibraryList.cmake | 9 +- cmake/CompatibilityVersionFile-BASIC.cmake.in | 45 +- ...bilityVersionFile-CXX_ABI.cmake.in.license | 42 ++ ...ityVersionFile-CXX_LAYOUT.cmake.in.license | 42 ++ ...tibilityVersionFile-C_ABI.cmake.in.license | 42 ++ cmake/CopyImportedTarget.cmake | 7 +- cmake/CopyResourcesToBuildTree.cmake | 9 +- cmake/CppcheckTargets.cmake | 19 +- cmake/CreateDashboardScripts.cmake | 9 +- cmake/CreateImportedTarget.cmake | 9 +- cmake/CreateLaunchers.cmake | 612 ++++++++++-------- cmake/DashboardScript.cmake.in | 13 +- cmake/DoxygenTargets.cmake | 9 +- cmake/DoxygenTargets.doxyfile.in | 9 + cmake/EnableExtraCompilerWarnings.cmake | 95 ++- cmake/EnableProfiling.cmake | 9 +- cmake/FileCopyTargets.cmake | 9 +- cmake/FindALUT.cmake | 9 +- cmake/FindAdrienne.cmake | 9 +- cmake/FindBluez.cmake | 9 +- cmake/FindCPPDOM.cmake | 9 +- cmake/FindColibriApi.cmake | 9 +- cmake/FindDCubed.cmake | 9 +- cmake/FindDirectShow.cmake | 9 +- cmake/FindDirectX.cmake | 9 +- cmake/FindFlagpoll.cmake | 9 +- cmake/FindGDB.cmake | 9 +- cmake/FindGHOST.cmake | 9 +- cmake/FindGLEW.cmake | 4 +- cmake/FindGLUI.cmake | 9 +- cmake/FindGLUT.cmake | 8 +- cmake/FindGMTL.cmake | 9 +- cmake/FindGPM.cmake | 9 +- cmake/FindGadgeteer12.cmake | 9 +- cmake/FindGadgeteer20.cmake | 13 +- cmake/FindGlove5DT.cmake | 9 +- cmake/FindHIDAPI.cmake | 231 ++++++- cmake/FindIDLJ.cmake | 9 +- cmake/FindInterSense.cmake | 10 +- cmake/FindJCCL12.cmake | 9 +- cmake/FindJCCL14.cmake | 13 +- cmake/FindJsonCpp.cmake | 11 +- cmake/FindJtTk.cmake | 9 +- cmake/FindJtTk.stampkey.cmake.in | 12 +- cmake/FindLAPACKLibs.cmake | 9 +- cmake/FindLibFreespace.cmake | 9 +- cmake/FindLibusb1.cmake | 19 +- cmake/FindLuabind.cmake | 9 +- cmake/FindLyX.cmake | 9 +- cmake/FindMacHID.cmake | 9 +- cmake/FindMarkdown.cmake | 9 +- cmake/FindOVR.cmake | 4 + cmake/FindOpenCV1.cmake | 245 ------- cmake/FindOpenHaptics.cmake | 9 +- cmake/FindParasolid.cmake | 9 +- cmake/FindPerformer.cmake | 9 +- cmake/FindPerlModules.cmake | 9 +- cmake/FindQVRPN.cmake | 9 +- cmake/FindSDL2.cmake | 7 +- cmake/FindSonix12.cmake | 9 +- cmake/FindSonix14.cmake | 13 +- cmake/FindTR1.cmake | 9 +- cmake/FindTooN.cmake | 9 +- cmake/FindTooNtag.cmake | 9 +- cmake/FindTweek12.cmake | 9 +- cmake/FindTweek14.cmake | 13 +- cmake/FindVPR20.cmake | 9 +- cmake/FindVPR22.cmake | 13 +- cmake/FindVPS.cmake | 9 +- cmake/FindVRJ22.cmake | 9 +- cmake/FindVRJ30.cmake | 10 +- cmake/FindVRJOGL22.cmake | 9 +- cmake/FindVRJOGL30.cmake | 13 +- cmake/FindVRJuggler.cmake | 9 +- cmake/FindVRJuggler22.cmake | 9 +- cmake/FindVRJuggler30.cmake | 12 +- cmake/FindVRPN.cmake | 9 +- cmake/FindViewPoint.cmake | 9 +- cmake/FindVirtuoseAPI.cmake | 8 + cmake/FindVirtuoseVPP.cmake | 8 + cmake/FindWayland.cmake | 5 +- cmake/FindWiiSCAAT.cmake | 9 +- cmake/FindWiiUse.cmake | 9 +- cmake/FindWinHID.cmake | 9 +- cmake/FindWindowsSDK.cmake | 26 +- cmake/FindXrandr.cmake | 4 + cmake/Findargp.cmake | 9 +- cmake/Findcppcheck.cmake | 17 +- cmake/Findcppcheck.cpp | 13 +- cmake/Findcppunit.cmake | 9 +- cmake/Findcutil.cmake | 9 +- cmake/Finddb2pdf.cmake | 9 +- cmake/FindosgLua.cmake | 9 +- cmake/Findquatlib.cmake | 9 +- cmake/Findudev.cmake | 20 +- cmake/GenerateCompatibilityVersionFile.cmake | 39 +- cmake/GetCPUDetails.cmake | 9 +- cmake/GetCompilerInfoString.cmake | 15 +- cmake/GetDefineString.cmake | 9 +- cmake/GetDefineString.cpp.in | 9 +- cmake/GetDirectoryList.cmake | 9 +- cmake/GetFileList.cmake | 9 +- cmake/GetForceIncludeDefinitions.cmake | 9 +- cmake/GetGitRevisionDescription.cmake | 351 ++++++---- cmake/GetGitRevisionDescription.cmake.in | 43 +- cmake/GetMSVCVersion.cmake | 8 +- cmake/GetSearchDirs.cmake | 38 -- cmake/GetSubprojectStatus.cmake | 9 +- cmake/InstallDebugSymbols.cmake | 9 +- cmake/Licensing.cmake | 133 ---- cmake/ListCombinations.cmake | 9 +- cmake/ListFilter.cmake | 9 +- cmake/LuaTargets.cmake | 9 +- cmake/MSVCMultipleProcessCompile.cmake | 9 +- cmake/MSVCStaticRuntime.cmake | 9 +- cmake/MSVCVerboseLinking.cmake | 9 +- cmake/MapImportedReleaseVariants.cmake | 9 +- cmake/MinGWSearchPathExtras.cmake | 7 +- cmake/OptionRequires.cmake | 9 +- cmake/PlatformDefinitions.cmake | 4 + cmake/PrefixListGlob.cmake | 9 +- cmake/ProgramFilesGlob.cmake | 9 +- cmake/README.markdown | 126 ++-- cmake/ResetConfigurations.cmake | 8 +- .../SearchProgramFilesForOpenSceneGraph.cmake | 9 +- cmake/SetDefaultBuildType.cmake | 9 +- cmake/SplitLibraryList.cmake | 9 +- cmake/StampSourcesWithVersion.cmake | 9 +- cmake/StampSourcesWithVersion.sed.in | 10 +- cmake/StashMapConfig.cmake | 9 +- cmake/TCHARWorkaround.cmake | 9 +- cmake/UseBackportedModules.cmake | 9 +- cmake/UseFolders.cmake | 11 +- cmake/UseMarkdown.cmake | 9 +- cmake/UseTR1.cmake | 9 +- cmake/WarningDev.cmake | 9 +- .../SelectLibraryConfigurations.cmake | 2 + .../osg/FindOpenSceneGraph.cmake | 2 + .../osg/FindOpenThreads.cmake | 2 + cmake/cmake-2.8.0-modules/osg/Findosg.cmake | 2 + .../osg/FindosgAnimation.cmake | 2 + cmake/cmake-2.8.0-modules/osg/FindosgDB.cmake | 2 + cmake/cmake-2.8.0-modules/osg/FindosgFX.cmake | 2 + cmake/cmake-2.8.0-modules/osg/FindosgGA.cmake | 2 + .../osg/FindosgIntrospection.cmake | 2 + .../osg/FindosgManipulator.cmake | 2 + .../osg/FindosgParticle.cmake | 2 + .../osg/FindosgProducer.cmake | 2 + .../osg/FindosgShadow.cmake | 2 + .../cmake-2.8.0-modules/osg/FindosgSim.cmake | 2 + .../osg/FindosgTerrain.cmake | 2 + .../cmake-2.8.0-modules/osg/FindosgText.cmake | 2 + .../cmake-2.8.0-modules/osg/FindosgUtil.cmake | 2 + .../osg/FindosgViewer.cmake | 2 + .../osg/FindosgVolume.cmake | 2 + .../osg/FindosgWidget.cmake | 2 + .../osg/Findosg_functions.cmake | 2 + .../patchctestbug10149/CTest.cmake | 2 + .../patchctestbug10149/CTestScriptMode.cmake | 2 + .../patchctestbug10149/CTestTargets.cmake | 5 +- .../CMakePackageConfigHelpers.cmake | 2 + .../CMakeParseArguments.cmake | 2 + .../FixWinInstallPrefix.cmake | 11 +- cmake/cmake-2.8.3-modules/autoinclude.cmake | 11 +- .../ImproveEclipseGCCErrors.cmake | 11 +- cmake/cmake-2.8.4-modules/autoinclude.cmake | 11 +- .../cmake-2.8.4-modules/boost/FindBoost.cmake | 2 + cmake/cmake-3.2.0-modules/FindGit.cmake | 12 +- .../WriteCompilerDetectionHeader.cmake | 4 +- .../RequireOutOfSourceBuild.cmake | 13 +- cmake/cmake-4.0.0-modules/autoinclude.cmake | 11 +- cmake/ghost-fake-stl/alloc.h | 8 +- cmake/ghost-fake-stl/hash_map.h | 8 +- cmake/ghost-fake-stl/iostream.h | 10 +- cmake/ghost-fake-stl/list.h | 10 +- cmake/ghost-fake-stl/pair.h | 8 +- cmake/ghost-fake-stl/set.h | 10 +- cmake/ghost-fake-stl/vector.h | 10 +- .../launcher-templates/genericlauncher.cmd.in | 5 +- .../launcher-templates/genericlauncher.sh.in | 3 + cmake/launcher-templates/launcher.env.cmd.in | 2 + cmake/launcher-templates/launcher.env.sh.in | 2 + .../perconfig.vcproj.user.in | 7 +- .../perconfig.vcxproj.user.in | 7 +- .../launcher-templates/targetlauncher.cmd.in | 2 + cmake/launcher-templates/targetlauncher.sh.in | 3 + cmake/launcher-templates/vcproj.user.in | 4 + cmake/launcher-templates/vcxproj.user.in | 4 + cmake/module-docs/AllModuleDependencies.dot | 8 + .../AllModuleDependencies.jpg.license | 3 + .../AllModuleDependencies.pdf.license | 3 + .../AllModuleDependencies.png.license | 3 + ...e-FindMyPackage-UsingImportedTargets.cmake | 12 +- cmake/module-docs/Example-FindMyPackage.cmake | 12 +- .../Example-FindMySimplePackage.cmake | 9 +- cmake/module-help.html | 224 +++---- cmake/module-help.txt | 440 ++++++------- cmake/nested_targets/DCubed/CMakeLists.txt | 11 +- .../DCubed/d3ew_p/CMakeLists.txt | 11 +- .../DCubed/d3ew_scene/CMakeLists.txt | 11 +- .../nested_targets/OpenHaptics/CMakeLists.txt | 11 +- cmake/nested_targets/Parasolid/CMakeLists.txt | 11 +- cmake/nested_targets/cutil/CMakeLists.txt | 9 +- cmake/package-licensing/Boost.cmake | 13 - cmake/package-licensing/Eigen.cmake | 13 - cmake/package-licensing/FLTK.cmake | 14 - cmake/package-licensing/Lua.cmake | 14 - cmake/package-licensing/LuaBind.cmake | 15 - .../OpenHapticsAcademicEdition.cmake | 15 - cmake/package-licensing/OpenSceneGraph.cmake | 13 - .../PhysicalModelingUtils.cmake | 13 - cmake/package-licensing/Qt-LGPL.cmake | 13 - cmake/package-licensing/VPS.cmake | 15 - cmake/package-licensing/VRJuggLua.cmake | 19 - cmake/package-licensing/VRJuggler.cmake | 15 - cmake/package-licensing/VirtuoseAPI.cmake | 14 - cmake/package-licensing/osgLua.cmake | 16 - cmake/package/fixupbundle.cmake.in | 13 +- .../workarounds/mac-alut-framework/AL/alut.h | 3 + cmake/workarounds/mac-gl/GL/gl.h | 3 + cmake/workarounds/mac-gl/GL/glui.h | 3 + cmake/workarounds/mac-gl/GL/glut.h | 3 + cmake/workarounds/mac-openal/AL/al.h | 3 + cmake/workarounds/mac-openal/AL/alc.h | 3 + cmake/workarounds/tchar/tchar.h | 5 +- 240 files changed, 2707 insertions(+), 1939 deletions(-) create mode 100644 cmake/CompatibilityVersionFile-CXX_ABI.cmake.in.license create mode 100644 cmake/CompatibilityVersionFile-CXX_LAYOUT.cmake.in.license create mode 100644 cmake/CompatibilityVersionFile-C_ABI.cmake.in.license delete mode 100644 cmake/FindOpenCV1.cmake delete mode 100644 cmake/GetSearchDirs.cmake delete mode 100644 cmake/Licensing.cmake create mode 100644 cmake/module-docs/AllModuleDependencies.jpg.license create mode 100644 cmake/module-docs/AllModuleDependencies.pdf.license create mode 100644 cmake/module-docs/AllModuleDependencies.png.license delete mode 100644 cmake/package-licensing/Boost.cmake delete mode 100644 cmake/package-licensing/Eigen.cmake delete mode 100644 cmake/package-licensing/FLTK.cmake delete mode 100644 cmake/package-licensing/Lua.cmake delete mode 100644 cmake/package-licensing/LuaBind.cmake delete mode 100644 cmake/package-licensing/OpenHapticsAcademicEdition.cmake delete mode 100644 cmake/package-licensing/OpenSceneGraph.cmake delete mode 100644 cmake/package-licensing/PhysicalModelingUtils.cmake delete mode 100644 cmake/package-licensing/Qt-LGPL.cmake delete mode 100644 cmake/package-licensing/VPS.cmake delete mode 100644 cmake/package-licensing/VRJuggLua.cmake delete mode 100644 cmake/package-licensing/VRJuggler.cmake delete mode 100644 cmake/package-licensing/VirtuoseAPI.cmake delete mode 100644 cmake/package-licensing/osgLua.cmake diff --git a/cmake-local/CMakeBoostHelper.cmake b/cmake-local/CMakeBoostHelper.cmake index 395c1fe2b..67cd1957f 100644 --- a/cmake-local/CMakeBoostHelper.cmake +++ b/cmake-local/CMakeBoostHelper.cmake @@ -1,7 +1,7 @@ # Help CMake find recent Boost MSVC binaries without manual configuration. # # Original Author: -# 2014-2016 Ryan Pavlik +# 2014-2016 Rylie Pavlik # # Copyright Sensics, Inc. 2014-2016. # Distributed under the Boost Software License, Version 1.0. diff --git a/cmake/.gitattributes b/cmake/.gitattributes index c20db92e9..6ad0c49ed 100644 --- a/cmake/.gitattributes +++ b/cmake/.gitattributes @@ -1,3 +1,11 @@ +# Copyright 2014, Sensics, Inc. +# +# 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) +# +# SPDX-License-Identifier: BSL-1.0 + # Auto detect text files and perform LF normalization * text=auto diff --git a/cmake/AboutTheseModules.cmake b/cmake/AboutTheseModules.cmake index 72082b1cf..9f9b4f089 100644 --- a/cmake/AboutTheseModules.cmake +++ b/cmake/AboutTheseModules.cmake @@ -1,4 +1,4 @@ -# - Dummy module containing information about these modules for the HELP file +# - Stub module containing information about these modules for the HELP file # This file documents a snapshot of the cmake-modules available from # http://github.com/rpavlik/cmake-modules/ # The latest version of these modules can always be found there. @@ -27,8 +27,11 @@ # http://www.cmake.org/cmake/help/cmake-2-8-docs.html # # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 diff --git a/cmake/BoostTestTargets.cmake b/cmake/BoostTestTargets.cmake index 31b3ae677..583af3744 100644 --- a/cmake/BoostTestTargets.cmake +++ b/cmake/BoostTestTargets.cmake @@ -27,14 +27,17 @@ # CopyResourcesToBuildTree # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com -# Iowa State University HCI Graduate Program/VRAC +# 2009-2021, Rylie Pavlik +# https://ryliepavlik.com/ +# +# Copyright 2021, Collabora, Ltd. +# Copyright 2009-2010, Iowa State University # -# 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) +# +# SPDX-License-Identifier: BSL-1.0 if(__add_boost_test) return() @@ -46,7 +49,9 @@ set(BOOST_TEST_TARGET_PREFIX "boosttest") if(NOT Boost_FOUND) find_package(Boost 1.34.0 QUIET) endif() -if("${Boost_VERSION}0" LESS "1034000") +if("${Boost_VERSION}" MATCHES "[0-9][.].*") + # we are OK +elseif("${Boost_VERSION}0" LESS "1034000") set(_shared_msg "NOTE: boost::test-based targets and tests cannot " "be added: boost >= 1.34.0 required but not found. " diff --git a/cmake/BoostTestTargetsDynamic.h b/cmake/BoostTestTargetsDynamic.h index ae1f38e74..c8d3152ab 100644 --- a/cmake/BoostTestTargetsDynamic.h +++ b/cmake/BoostTestTargetsDynamic.h @@ -1,3 +1,12 @@ +// Original Author: +// 2009-2021, Rylie Pavlik +// https://ryliepavlik.com/ +// +// Copyright 2021, Collabora, Ltd. +// Copyright 2009-2010, Iowa State University +// +// SPDX-License-Identifier: BSL-1.0 + // Small header computed by CMake to set up boost test. // include AFTER #define BOOST_TEST_MODULE whatever // but before any other boost test includes. diff --git a/cmake/BoostTestTargetsIncluded.h b/cmake/BoostTestTargetsIncluded.h index 253133ce2..a3fc1f805 100644 --- a/cmake/BoostTestTargetsIncluded.h +++ b/cmake/BoostTestTargetsIncluded.h @@ -1,3 +1,12 @@ +// Original Author: +// 2009-2021, Rylie Pavlik +// https://ryliepavlik.com/ +// +// Copyright 2021, Collabora, Ltd. +// Copyright 2009-2010, Iowa State University +// +// SPDX-License-Identifier: BSL-1.0 + // Small header computed by CMake to set up boost test. // include AFTER #define BOOST_TEST_MODULE whatever // but before any other boost test includes. diff --git a/cmake/BoostTestTargetsStatic.h b/cmake/BoostTestTargetsStatic.h index dd3cddae1..4be7332c2 100644 --- a/cmake/BoostTestTargetsStatic.h +++ b/cmake/BoostTestTargetsStatic.h @@ -1,3 +1,12 @@ +// Original Author: +// 2009-2021, Rylie Pavlik +// https://ryliepavlik.com/ +// +// Copyright 2021, Collabora, Ltd. +// Copyright 2009-2010, Iowa State University +// +// SPDX-License-Identifier: BSL-1.0 + // Small header computed by CMake to set up boost test. // include AFTER #define BOOST_TEST_MODULE whatever // but before any other boost test includes. diff --git a/cmake/BundleOSGPlugins.cmake b/cmake/BundleOSGPlugins.cmake index ef491d877..abea18c0e 100644 --- a/cmake/BundleOSGPlugins.cmake +++ b/cmake/BundleOSGPlugins.cmake @@ -16,14 +16,17 @@ # no additional modules required # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 function(_osgbundle_split_debug_versions releasevar debugvar) diff --git a/cmake/BundleOSGRuntime.cmake b/cmake/BundleOSGRuntime.cmake index 8d119261b..13e459b4d 100644 --- a/cmake/BundleOSGRuntime.cmake +++ b/cmake/BundleOSGRuntime.cmake @@ -9,14 +9,17 @@ # no additional modules required # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 function(_osgbundle_split_debug_versions releasevar debugvar) set(release) diff --git a/cmake/BundleVRJ22Runtime.cmake b/cmake/BundleVRJ22Runtime.cmake index 9198d2598..877ba208a 100644 --- a/cmake/BundleVRJ22Runtime.cmake +++ b/cmake/BundleVRJ22Runtime.cmake @@ -7,14 +7,17 @@ # FindVRJuggler22 and its dependencies # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(WIN32) option(VRJUGGLERRUNTIME_BUNDLE diff --git a/cmake/BundleVRJ30Runtime.cmake b/cmake/BundleVRJ30Runtime.cmake index c661da0fe..4c83cbaf6 100644 --- a/cmake/BundleVRJ30Runtime.cmake +++ b/cmake/BundleVRJ30Runtime.cmake @@ -7,11 +7,20 @@ # FindVRJuggler22 and its dependencies # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # Updated for VR Juggler 3.0 by: # Brandon Newendorp +# +# Copyright 2009-2010, Iowa State University +# Copyright 2010, Brandon Newendorp +# +# 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) +# +# SPDX-License-Identifier: BSL-1.0 if(WIN32) option(VRJUGGLERRUNTIME_BUNDLE diff --git a/cmake/CheckMacHIDAPI.cmake b/cmake/CheckMacHIDAPI.cmake index 54337835a..b1612e89d 100644 --- a/cmake/CheckMacHIDAPI.cmake +++ b/cmake/CheckMacHIDAPI.cmake @@ -15,14 +15,17 @@ # ) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(APPLE) diff --git a/cmake/CheckMacHIDAPI.cpp b/cmake/CheckMacHIDAPI.cpp index 00d2a4679..d72dbbbdc 100644 --- a/cmake/CheckMacHIDAPI.cpp +++ b/cmake/CheckMacHIDAPI.cpp @@ -3,9 +3,9 @@ * \brief C++ source file used by CMake module CheckMacHIDAPI.cmake * * \author - * Ryan Pavlik, 2009-2010 - * - * http://academic.cleardefinition.com/ + * Rylie Pavlik, 2009-2010 + * + * https://ryliepavlik.com/ * * \author * Based on code extracted from VRPN 07.22 for use as a minimal test case diff --git a/cmake/CheckVersion.cmake b/cmake/CheckVersion.cmake index baece76d8..fe605815f 100644 --- a/cmake/CheckVersion.cmake +++ b/cmake/CheckVersion.cmake @@ -4,14 +4,17 @@ # no additional modules required # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(__check_version) return() diff --git a/cmake/CleanDirectoryList.cmake b/cmake/CleanDirectoryList.cmake index 58b8963f9..d123b81d4 100644 --- a/cmake/CleanDirectoryList.cmake +++ b/cmake/CleanDirectoryList.cmake @@ -5,14 +5,17 @@ # Requires CMake 2.6 or newer (uses the 'function' command) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University. +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(__clean_directory_list) return() diff --git a/cmake/CleanLibraryList.cmake b/cmake/CleanLibraryList.cmake index 77613934d..8247ca58f 100644 --- a/cmake/CleanLibraryList.cmake +++ b/cmake/CleanLibraryList.cmake @@ -17,14 +17,17 @@ # Requires CMake 2.6 or newer (uses the 'function' command) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(__clean_library_list) return() diff --git a/cmake/CompatibilityVersionFile-BASIC.cmake.in b/cmake/CompatibilityVersionFile-BASIC.cmake.in index d2b97ba7a..12d82902e 100644 --- a/cmake/CompatibilityVersionFile-BASIC.cmake.in +++ b/cmake/CompatibilityVersionFile-BASIC.cmake.in @@ -1,3 +1,46 @@ +#============================================================================= +# Copyright 2015 Sensics, Inc. +# Copyright 2012 Alexander Neundorf +# +# Distributed under the OSI-approved BSD License (the "License"); +# see below. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause +#============================================================================= +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# * Neither the names of Kitware, Inc., the Insight Software Consortium, +# nor the names of their contributors may be used to endorse or promote +# products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#============================================================================= + # will always be the actual version one # Wrapped in a macro because it's got a return before we want. macro(_gcvf_version) @@ -16,4 +59,4 @@ if(ANDROID AND NOT ("${ANDROID_ABI}" STREQUAL "@ANDROID_ABI@")) set(PACKAGE_VERSION "${PACKAGE_VERSION} (Android @ANDROID_ABI@)") set(PACKAGE_VERSION_UNSUITABLE TRUE) return() -endif() \ No newline at end of file +endif() diff --git a/cmake/CompatibilityVersionFile-CXX_ABI.cmake.in.license b/cmake/CompatibilityVersionFile-CXX_ABI.cmake.in.license new file mode 100644 index 000000000..8072bd9e4 --- /dev/null +++ b/cmake/CompatibilityVersionFile-CXX_ABI.cmake.in.license @@ -0,0 +1,42 @@ +#============================================================================= +# Copyright 2015 Sensics, Inc. +# Copyright 2012 Alexander Neundorf +# +# Distributed under the OSI-approved BSD License (the "License"); +# see below. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause +#============================================================================= +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# * Neither the names of Kitware, Inc., the Insight Software Consortium, +# nor the names of their contributors may be used to endorse or promote +# products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#============================================================================= diff --git a/cmake/CompatibilityVersionFile-CXX_LAYOUT.cmake.in.license b/cmake/CompatibilityVersionFile-CXX_LAYOUT.cmake.in.license new file mode 100644 index 000000000..8072bd9e4 --- /dev/null +++ b/cmake/CompatibilityVersionFile-CXX_LAYOUT.cmake.in.license @@ -0,0 +1,42 @@ +#============================================================================= +# Copyright 2015 Sensics, Inc. +# Copyright 2012 Alexander Neundorf +# +# Distributed under the OSI-approved BSD License (the "License"); +# see below. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause +#============================================================================= +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# * Neither the names of Kitware, Inc., the Insight Software Consortium, +# nor the names of their contributors may be used to endorse or promote +# products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#============================================================================= diff --git a/cmake/CompatibilityVersionFile-C_ABI.cmake.in.license b/cmake/CompatibilityVersionFile-C_ABI.cmake.in.license new file mode 100644 index 000000000..8072bd9e4 --- /dev/null +++ b/cmake/CompatibilityVersionFile-C_ABI.cmake.in.license @@ -0,0 +1,42 @@ +#============================================================================= +# Copyright 2015 Sensics, Inc. +# Copyright 2012 Alexander Neundorf +# +# Distributed under the OSI-approved BSD License (the "License"); +# see below. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause +#============================================================================= +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# * Neither the names of Kitware, Inc., the Insight Software Consortium, +# nor the names of their contributors may be used to endorse or promote +# products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#============================================================================= diff --git a/cmake/CopyImportedTarget.cmake b/cmake/CopyImportedTarget.cmake index fed23b4fa..517ab9f86 100644 --- a/cmake/CopyImportedTarget.cmake +++ b/cmake/CopyImportedTarget.cmake @@ -8,12 +8,15 @@ # Likely requires CMake 2.8.12 or newer to work well. # # Original Author: -# 2015 Ryan Pavlik +# 2015 Rylie Pavlik +# +# Copyright 2015, Sensics, Inc. # -# Copyright Sensics, Inc. 2015. # 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) +# +# SPDX-License-Identifier: BSL-1.0 function(copy_imported_targets _target) foreach(_dep ${ARGN}) diff --git a/cmake/CopyResourcesToBuildTree.cmake b/cmake/CopyResourcesToBuildTree.cmake index 3512cc484..9e83c8707 100644 --- a/cmake/CopyResourcesToBuildTree.cmake +++ b/cmake/CopyResourcesToBuildTree.cmake @@ -5,14 +5,17 @@ # Requires CMake 2.6 or newer (uses the 'function' command) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(__copy_resources_to_build_tree) return() diff --git a/cmake/CppcheckTargets.cmake b/cmake/CppcheckTargets.cmake index cb21bed73..96f57b7bb 100644 --- a/cmake/CppcheckTargets.cmake +++ b/cmake/CppcheckTargets.cmake @@ -12,18 +12,21 @@ # Requires CMake 2.8 or newer (uses VERSION_LESS) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. -# Copyright Anthony Pesch 2014 -# Copyright Stefan Eilemann 2014 -# Copyright Nicholas Brown 2015 -# Copyright Ryan Pavlik 2017 +# Copyright 2009-2010, Iowa State University +# Copyright 2014, Anthony Pesch +# Copyright 2014, Stefan Eilemann +# Copyright 2015, Nicholas Brown +# Copyright 2017, Rylie Pavlik +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(__add_cppcheck) return() @@ -143,7 +146,7 @@ function(add_cppcheck_sources _targetname) COMMENT "${_targetname}_cppcheck: Running cppcheck on target ${_targetname}..." VERBATIM) - add_dependencies(cppcheck ${_targetname}_cppcheck) + add_dependencies(cppcheck ${_targetname}_cppcheck) endif() endfunction() diff --git a/cmake/CreateDashboardScripts.cmake b/cmake/CreateDashboardScripts.cmake index 22420b5b4..b26cda52d 100644 --- a/cmake/CreateDashboardScripts.cmake +++ b/cmake/CreateDashboardScripts.cmake @@ -20,14 +20,17 @@ # as well as FindGit.cmake (included with 2.8.2, may be backported) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 # Only do any of the prep work if not already in a dashboard script if(NOT IN_DASHBOARD_SCRIPT) diff --git a/cmake/CreateImportedTarget.cmake b/cmake/CreateImportedTarget.cmake index 31fb3b7e8..6ab974454 100644 --- a/cmake/CreateImportedTarget.cmake +++ b/cmake/CreateImportedTarget.cmake @@ -9,14 +9,17 @@ # Requires CMake 2.6 or newer (uses the 'function' command) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(__create_imported_target) return() diff --git a/cmake/CreateLaunchers.cmake b/cmake/CreateLaunchers.cmake index 571f044d7..b29b165d5 100644 --- a/cmake/CreateLaunchers.cmake +++ b/cmake/CreateLaunchers.cmake @@ -3,6 +3,7 @@ # include(CreateLaunchers) - to make these available # guess_runtime_library_dirs( [ ...]) # create_default_target_launcher( +# [COMMAND ] # [ARGS ] # [FORWARD_ARGS] # [RUNTIME_LIBRARY_DIRS ] @@ -10,6 +11,7 @@ # [ENVIRONMENT [...]]) # # create_target_launcher( +# [COMMAND ] # [ARGS ] # [FORWARD_ARGS] # [RUNTIME_LIBRARY_DIRS ] @@ -17,333 +19,395 @@ # [ENVIRONMENT [...]]) # # create_generic_launcher( +# [COMMAND ] # [RUNTIME_LIBRARY_DIRS ] # [WORKING_DIRECTORY ] # [ENVIRONMENT [...]]) # - sets GENERIC_LAUNCHER_COMMAND and GENERIC_LAUNCHER_FAIL_REGULAR_EXPRESSION # # Requires these CMake modules: -# ListFilter -# ProgramFilesGlob # CleanDirectoryList # # Requires CMake 2.6 or newer (uses the 'function' command) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com -# Iowa State University HCI Graduate Program/VRAC +# 2009-2020 Rylie Pavlik +# https://ryliepavlik.com/ +# +# Copyright 2020, Rylie Pavlik +# Copyright 2014-2019, Contributors +# Copyright 2018-2019, caseymcc +# Copyright 2009-2013, Iowa State University. # -# 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) +# +# SPDX-License-Identifier: BSL-1.0 if(__create_launchers) - return() + return() endif() set(__create_launchers YES) +cmake_policy(PUSH) +cmake_policy(SET CMP0053 NEW) + include(CleanDirectoryList) # We must run the following at "include" time, not at function call time, # to find the path to this module rather than the path to a calling list file -get_filename_component(_launchermoddir - ${CMAKE_CURRENT_LIST_FILE} - PATH) +get_filename_component(_launchermoddir ${CMAKE_CURRENT_LIST_FILE} PATH) set(_launchermoddir "${_launchermoddir}/launcher-templates") macro(_launcher_system_settings) - if(CMAKE_SIZEOF_VOID_P EQUAL 8) - set(BITS 64) - else() - set(BITS 32) - endif() - - if(WIN32) - # Find user and system name - set(SYSTEM_NAME $ENV{USERDOMAIN}) - set(USER_NAME $ENV{USERNAME}) - set(VCPROJ_TYPE vcproj) - set(USERFILE_EXTENSION ${SYSTEM_NAME}.${USER_NAME}.user) - set(LAUNCHER_LINESEP " ") - if(MSVC90) - set(USERFILE_VC_VERSION 9.00) - elseif(MSVC80) - set(USERFILE_VC_VERSION 8.00) - elseif(MSVC71) - set(USERFILE_VC_VERSION 7.10) - elseif(MSVC10 OR (MSVC AND MSVC_VERSION GREATER 1600)) # 2010 or newer - set(LAUNCHER_LINESEP "\n") - set(USERFILE_VC_VERSION 10.00) - set(USERFILE_EXTENSION user) - set(VCPROJ_TYPE vcxproj) - endif() - if(BITS EQUAL 64) - set(USERFILE_PLATFORM x64) - else() - set(USERFILE_PLATFORM Win${BITS}) - endif() - set(_pathdelim ";") - set(_suffix "cmd") - else() - set(_pathdelim ":") - set(USERFILE_PLATFORM ${CMAKE_SYSTEM_NAME}${BITS}) - set(_suffix "sh") - find_package(GDB QUIET) - if(GDB_FOUND) - set(LAUNCHERS_GOT_GDB YES) - if(GDB_HAS_RETURN_CHILD_RESULT) - set(LAUNCHERS_GDB_ARG --return-child-result) - endif() - else() - set(LAUNCHERS_GOT_GDB) - endif() - endif() - - if(WIN32 AND NOT USERFILE_REMOTE_MACHINE) - site_name(USERFILE_REMOTE_MACHINE) - mark_as_advanced(USERFILE_REMOTE_MACHINE) - endif() + if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(BITS 64) + else() + set(BITS 32) + endif() + + if(WIN32) + # Find user and system name + set(SYSTEM_NAME $ENV{USERDOMAIN}) + set(USER_NAME $ENV{USERNAME}) + set(VCPROJ_TYPE vcproj) + set(USERFILE_EXTENSION ${SYSTEM_NAME}.${USER_NAME}.user) + set(LAUNCHER_LINESEP " ") + if(MSVC90) + set(USERFILE_VC_VERSION 9.00) + elseif(MSVC80) + set(USERFILE_VC_VERSION 8.00) + elseif(MSVC71) + set(USERFILE_VC_VERSION 7.10) + elseif(MSVC10 OR (MSVC AND MSVC_VERSION GREATER 1600)) # 2010 or newer + set(LAUNCHER_LINESEP "\n") + set(USERFILE_VC_VERSION 10.00) + set(USERFILE_EXTENSION user) + set(VCPROJ_TYPE vcxproj) + endif() + if(BITS EQUAL 64) + set(USERFILE_PLATFORM x64) + else() + set(USERFILE_PLATFORM Win${BITS}) + endif() + set(_pathdelim "$") + set(_suffix "cmd") + else() + set(_pathdelim ":") + set(USERFILE_PLATFORM ${CMAKE_SYSTEM_NAME}${BITS}) + set(_suffix "sh") + find_package(GDB QUIET) + if(GDB_FOUND) + set(LAUNCHERS_GOT_GDB YES) + if(GDB_HAS_RETURN_CHILD_RESULT) + set(LAUNCHERS_GDB_ARG --return-child-result) + endif() + else() + set(LAUNCHERS_GOT_GDB) + endif() + endif() + + if(WIN32 AND NOT USERFILE_REMOTE_MACHINE) + site_name(USERFILE_REMOTE_MACHINE) + mark_as_advanced(USERFILE_REMOTE_MACHINE) + endif() endmacro() macro(_launcher_process_args) - set(_nowhere) - set(_curdest _nowhere) - set(_val_args - ARGS - RUNTIME_LIBRARY_DIRS - WORKING_DIRECTORY - ENVIRONMENT - TARGET_PLATFORM) - set(_bool_args FORWARD_ARGS) - foreach(_arg ${_val_args} ${_bool_args}) - set(${_arg}) - endforeach() - foreach(_element ${ARGN}) - string(REPLACE ";" "\\;" _element "${_element}") - list(FIND _val_args "${_element}" _val_arg_find) - list(FIND _bool_args "${_element}" _bool_arg_find) - if("${_val_arg_find}" GREATER "-1") - set(_curdest "${_element}") - elseif("${_bool_arg_find}" GREATER "-1") - set("${_element}" ON) - set(_curdest _nowhere) - else() - list(APPEND ${_curdest} "${_element}") - endif() - endforeach() - - if(_nowhere) - message(FATAL_ERROR - "Syntax error in use of a function in CreateLaunchers!") - endif() - - # Turn into a list of native paths - set(_runtime_lib_dirs) - foreach(_dlldir ${RUNTIME_LIBRARY_DIRS}) - file(TO_NATIVE_PATH "${_dlldir}" _path) - set(_runtime_lib_dirs "${_runtime_lib_dirs}${_path}${_pathdelim}") - endforeach() - - if(NOT WORKING_DIRECTORY) - set(WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") - endif() - - if(FORWARD_ARGS) - if(WIN32) - set(FWD_ARGS %*) - else() - set(FWD_ARGS $*) - endif() - else() - set(FWD_ARGS) - endif() - - if(TARGET_PLATFORM) - set(USERFILE_PLATFORM ${TARGET_PLATFORM}) - endif() - - set(USERFILE_WORKING_DIRECTORY "${WORKING_DIRECTORY}") - set(USERFILE_COMMAND_ARGUMENTS "${ARGS}") - set(LAUNCHERSCRIPT_COMMAND_ARGUMENTS "${ARGS} ${FWD_ARGS}") - - if(WIN32) - if(_runtime_lib_dirs) - set(RUNTIME_LIBRARIES_ENVIRONMENT "PATH=${_runtime_lib_dirs};%PATH%") - endif() - file(READ - "${_launchermoddir}/launcher.env.cmd.in" - _cmdenv) - else() - if(_runtime_lib_dirs) - if(APPLE) - - set(RUNTIME_LIBRARIES_ENVIRONMENT - "DYLD_LIBRARY_PATH=${_runtime_lib_dirs}:$DYLD_LIBRARY_PATH") - else() - set(RUNTIME_LIBRARIES_ENVIRONMENT - "LD_LIBRARY_PATH=${_runtime_lib_dirs}:$LD_LIBRARY_PATH") - endif() - endif() - file(READ - "${_launchermoddir}/launcher.env.sh.in" - _cmdenv) - endif() - set(USERFILE_ENVIRONMENT "${RUNTIME_LIBRARIES_ENVIRONMENT}") - - set(USERFILE_ENV_COMMANDS) - foreach(_arg "${RUNTIME_LIBRARIES_ENVIRONMENT}" ${ENVIRONMENT}) - if(_arg) - string(CONFIGURE - "@USERFILE_ENVIRONMENT@@LAUNCHER_LINESEP@@_arg@" - USERFILE_ENVIRONMENT - @ONLY) - endif() - string(CONFIGURE - "@USERFILE_ENV_COMMANDS@${_cmdenv}" - USERFILE_ENV_COMMANDS - @ONLY) - endforeach() + set(_nowhere) + set(_curdest _nowhere) + set(_val_args ARGS COMMAND RUNTIME_LIBRARY_DIRS WORKING_DIRECTORY + ENVIRONMENT TARGET_PLATFORM) + set(_bool_args FORWARD_ARGS) + foreach(_arg ${_val_args} ${_bool_args}) + set(${_arg}) + endforeach() + foreach(_element ${ARGN}) + string(REPLACE ";" "\\;" _element "${_element}") + list(FIND _val_args "${_element}" _val_arg_find) + list(FIND _bool_args "${_element}" _bool_arg_find) + if("${_val_arg_find}" GREATER "-1") + set(_curdest "${_element}") + elseif("${_bool_arg_find}" GREATER "-1") + set("${_element}" ON) + set(_curdest _nowhere) + else() + list(APPEND ${_curdest} "${_element}") + endif() + endforeach() + + if(_nowhere) + message( + FATAL_ERROR "Syntax error in use of a function in CreateLaunchers!") + endif() + + # Turn into a list of native paths + set(_runtime_lib_dirs) + foreach(_dlldir ${RUNTIME_LIBRARY_DIRS}) + file(TO_NATIVE_PATH "${_dlldir}" _path) + if(NOT EXISTS "${_path}") #this is not a file so lets leave it as is + set(_path ${_dlldir}) + endif() + set(_runtime_lib_dirs "${_runtime_lib_dirs}${_path}${_pathdelim}") + endforeach() + + if(NOT WORKING_DIRECTORY) + set(WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + endif() + + if(NOT COMMAND) + set(COMMAND "$") + endif() + + if(FORWARD_ARGS) + if(WIN32) + set(FWD_ARGS %*) + else() + set(FWD_ARGS $*) + endif() + else() + set(FWD_ARGS) + endif() + + if(TARGET_PLATFORM) + set(USERFILE_PLATFORM ${TARGET_PLATFORM}) + endif() + + set(USERFILE_WORKING_DIRECTORY "${WORKING_DIRECTORY}") + set(USERFILE_COMMAND "${COMMAND}") + set(USERFILE_COMMAND_ARGUMENTS "${ARGS}") + set(LAUNCHERSCRIPT_COMMAND_ARGUMENTS "${ARGS} ${FWD_ARGS}") + + if(WIN32) + if(_runtime_lib_dirs) + set(RUNTIME_LIBRARIES_ENVIRONMENT + "PATH=${_runtime_lib_dirs}$%PATH%") + endif() + file(READ "${_launchermoddir}/launcher.env.cmd.in" _cmdenv) + else() + if(_runtime_lib_dirs) + if(APPLE) + + set(RUNTIME_LIBRARIES_ENVIRONMENT + "DYLD_LIBRARY_PATH=${_runtime_lib_dirs}:$DYLD_LIBRARY_PATH") + else() + set(RUNTIME_LIBRARIES_ENVIRONMENT + "LD_LIBRARY_PATH=${_runtime_lib_dirs}:$LD_LIBRARY_PATH") + endif() + endif() + file(READ "${_launchermoddir}/launcher.env.sh.in" _cmdenv) + endif() + + set(USERFILE_ENVIRONMENT) + set(USERFILE_ENV_COMMANDS) + foreach(_arg "${RUNTIME_LIBRARIES_ENVIRONMENT}" ${ENVIRONMENT}) + if(_arg) + string(CONFIGURE "@USERFILE_ENVIRONMENT@@LAUNCHER_LINESEP@@_arg@" + USERFILE_ENVIRONMENT @ONLY) + endif() + string(CONFIGURE "@USERFILE_ENV_COMMANDS@${_cmdenv}" + USERFILE_ENV_COMMANDS @ONLY) + endforeach() endmacro() +#ok, we have gone very hackish on this function as the file(GENERATE) is very hard to work with as the cmake folks really don't +#want you writing generator files yourself, yet the user file is not planning to ever be supported macro(_launcher_produce_vcproj_user) - if(MSVC) - file(READ - "${_launchermoddir}/perconfig.${VCPROJ_TYPE}.user.in" - _perconfig) - set(USERFILE_CONFIGSECTIONS) - foreach(USERFILE_CONFIGNAME ${CMAKE_CONFIGURATION_TYPES}) - get_target_property(USERFILE_${USERFILE_CONFIGNAME}_COMMAND - ${_targetname} - LOCATION_${USERFILE_CONFIGNAME}) - file(TO_NATIVE_PATH - "${USERFILE_${USERFILE_CONFIGNAME}_COMMAND}" - USERFILE_${USERFILE_CONFIGNAME}_COMMAND) - string(CONFIGURE "${_perconfig}" _temp @ONLY ESCAPE_QUOTES) - string(CONFIGURE - "${USERFILE_CONFIGSECTIONS}${_temp}" - USERFILE_CONFIGSECTIONS - ESCAPE_QUOTES) - endforeach() - - - configure_file("${_launchermoddir}/${VCPROJ_TYPE}.user.in" - ${VCPROJNAME}.${VCPROJ_TYPE}.${USERFILE_EXTENSION} - @ONLY) - endif() + if(MSVC) + set(CMAKEFILES_PATH "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles") + set(TARGET_CMAKE_FILES "${CMAKEFILES_PATH}/${_targetname}") + file(READ "${_launchermoddir}/perconfig.${VCPROJ_TYPE}.user.in" + _perconfig) + + #generator expressions do not play well with ">" and "," + string(REPLACE ">" "$" _perconfig ${_perconfig}) + string(REPLACE "," "$" _perconfig ${_perconfig}) + + set(config_types) + if(CMAKE_CONFIGURATION_TYPES) + foreach(config_type ${CMAKE_CONFIGURATION_TYPES}) + set(config_types ${config_types} ${config_type}) + endforeach() + else() + set(config_types ${CMAKE_BUILD_TYPE}) + endif() + + set(USERFILE_CONFIGSECTIONS) + foreach(USERFILE_CONFIGNAME ${config_types}) + string(CONFIGURE "${_perconfig}" _temp @ONLY ESCAPE_QUOTES) + + #we are building the per config info with genertator expressions so that when generating the files only the config currently generated is being correctly filled in + set(_temp + "$,\n${_temp},$>\n" + ) + + #we are putting this info into the target properties so it can be recuresively added back during the generator calls + set_target_properties( + ${_targetname} + PROPERTIES LAUNCHER_USER_ELSE_${USERFILE_CONFIGNAME} ${_temp}) + + string(CONFIGURE "${USERFILE_CONFIGSECTIONS}${_temp}" + USERFILE_CONFIGSECTIONS ESCAPE_QUOTES) + endforeach() + + configure_file( + "${_launchermoddir}/${VCPROJ_TYPE}.user.in" + ${TARGET_CMAKE_FILES}.${VCPROJ_TYPE}.${USERFILE_EXTENSION}.config + @ONLY) + + #now we are looping thtough each config type loading the previous ones output, hopefully execution order stays the same as the generation request + set(launcher_last_config) + foreach(USERFILE_CONFIGNAME ${config_types}) + if(NOT launcher_last_config) + file( + GENERATE + OUTPUT + ${TARGET_CMAKE_FILES}.${VCPROJ_TYPE}.${USERFILE_CONFIGNAME}.usergen + INPUT + ${TARGET_CMAKE_FILES}.${VCPROJ_TYPE}.${USERFILE_EXTENSION}.config + CONDITION $) + else() + file( + GENERATE + OUTPUT + ${TARGET_CMAKE_FILES}.${VCPROJ_TYPE}.${USERFILE_CONFIGNAME}.usergen + INPUT + ${TARGET_CMAKE_FILES}.${VCPROJ_TYPE}.${launcher_last_config}.usergen + CONDITION $) + endif() + set(launcher_last_config ${USERFILE_CONFIGNAME}) + endforeach() + #build the final output from the last generation output + file( + GENERATE + OUTPUT ${VCPROJNAME}.${VCPROJ_TYPE}.${USERFILE_EXTENSION} + INPUT + ${TARGET_CMAKE_FILES}.${VCPROJ_TYPE}.${launcher_last_config}.usergen + ) + endif() endmacro() -macro(_launcher_configure_executable _src _tmp _target) -# get_filename_component(_targetname "${_target}" NAME) - get_filename_component(_targetpath "${_target}" PATH) - configure_file("${_src}" - "${_tmp}" - @ONLY) - file(COPY "${_tmp}" - DESTINATION "${_targetpath}" - FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) +macro(_launcher_configure_executable _src _tmp _target _config) + configure_file("${_src}" "${_tmp}" @ONLY) + + #used to convert generator expressions + file( + GENERATE + OUTPUT "${_target}" + INPUT "${_tmp}" + CONDITION $) + #we lose the ability to change the file permisions as there is no support there in file(GENERATE) (although it has been requested) + #and nothing runs after file(GENERATE) durning the cmake call + # file(COPY "${_tmp}" + # DESTINATION "${_targetpath}" + # FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) endmacro() macro(_launcher_create_target_launcher) - if(CMAKE_CONFIGURATION_TYPES) - # Multi-config generator - multiple launchers - foreach(_config ${CMAKE_CONFIGURATION_TYPES}) - get_target_property(USERFILE_${_config}_COMMAND - ${_targetname} - LOCATION_${_config}) - file(TO_NATIVE_PATH - "${USERFILE_${_config}_COMMAND}" - USERFILE_COMMAND) - set(_fn "launch-${_targetname}-${_config}.${_suffix}") - _launcher_configure_executable("${_launchermoddir}/targetlauncher.${_suffix}.in" - "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${_fn}" - "${CMAKE_CURRENT_BINARY_DIR}/${_fn}") - endforeach() - else() - # Single-config generator - single launcher - get_target_property(USERFILE_COMMAND - ${_targetname} - LOCATION) - file(TO_NATIVE_PATH - "${USERFILE_COMMAND}" - USERFILE_COMMAND) - _launcher_configure_executable("${_launchermoddir}/targetlauncher.${_suffix}.in" - "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/launch-${_targetname}.${_suffix}" - "${CMAKE_CURRENT_BINARY_DIR}/launch-${_targetname}.${_suffix}" - @ONLY) - endif() + if(CMAKE_CONFIGURATION_TYPES) + # Multi-config generator - multiple launchers + foreach(_config ${CMAKE_CONFIGURATION_TYPES}) + set(_fn "launch-${_targetname}-${_config}.${_suffix}") + _launcher_configure_executable( + "${_launchermoddir}/targetlauncher.${_suffix}.in" + "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${_fn}" + "${CMAKE_CURRENT_BINARY_DIR}/${_fn}" ${_config}) + endforeach() + else() + # Single-config generator - single launcher + _launcher_configure_executable( + "${_launchermoddir}/targetlauncher.${_suffix}.in" + "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/launch-${_targetname}.${_suffix}" + "${CMAKE_CURRENT_BINARY_DIR}/launch-${_targetname}.${_suffix}" + ${CMAKE_BUILD_TYPE}) + endif() endmacro() function(create_default_target_launcher _targetname) - _launcher_system_settings() - _launcher_process_args(${ARGN}) + _launcher_system_settings() + _launcher_process_args(${ARGN}) - set(VCPROJNAME "${CMAKE_BINARY_DIR}/ALL_BUILD") - _launcher_produce_vcproj_user() + set(VCPROJNAME "${CMAKE_BINARY_DIR}/ALL_BUILD") - _launcher_create_target_launcher() + _launcher_produce_vcproj_user() + _launcher_create_target_launcher() endfunction() function(create_target_launcher _targetname) - _launcher_system_settings() - _launcher_process_args(${ARGN}) + _launcher_system_settings() + _launcher_process_args(${ARGN}) - set(VCPROJNAME "${CMAKE_CURRENT_BINARY_DIR}/${_targetname}") - _launcher_produce_vcproj_user() + set(VCPROJNAME "${CMAKE_CURRENT_BINARY_DIR}/${_targetname}") - _launcher_create_target_launcher() + _launcher_produce_vcproj_user() + _launcher_create_target_launcher() endfunction() function(create_generic_launcher _launchername) - _launcher_system_settings() - _launcher_process_args(${ARGN}) - - if(NOT IS_ABSOLUTE _launchername) - set(_launchername - "${CMAKE_CURRENT_BINARY_DIR}/${_launchername}.${_suffix}") - else() - set(_launchername "${_launchername}.${_suffix}") - endif() - if(WIN32) - set(GENERIC_LAUNCHER_COMMAND "${_launchername}" PARENT_SCOPE) - set(GENERIC_LAUNCHER_FAIL_REGULAR_EXPRESSION) - else() - set(GENERIC_LAUNCHER_COMMAND sh "${_launchername}" PARENT_SCOPE) - set(GENERIC_LAUNCHER_FAIL_REGULAR_EXPRESSION - "Program terminated with signal") - endif() - - _launcher_configure_executable("${_launchermoddir}/genericlauncher.${_suffix}.in" - "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/genericlauncher.${_suffix}.in" - "${_launchername}") + _launcher_system_settings() + _launcher_process_args(${ARGN}) + + if(NOT IS_ABSOLUTE _launchername) + set(_launchername + "${CMAKE_CURRENT_BINARY_DIR}/${_launchername}.${_suffix}") + else() + set(_launchername "${_launchername}.${_suffix}") + endif() + if(WIN32) + set(GENERIC_LAUNCHER_COMMAND + "${_launchername}" + PARENT_SCOPE) + set(GENERIC_LAUNCHER_FAIL_REGULAR_EXPRESSION) + else() + set(GENERIC_LAUNCHER_COMMAND + sh "${_launchername}" + PARENT_SCOPE) + set(GENERIC_LAUNCHER_FAIL_REGULAR_EXPRESSION + "Program terminated with signal") + endif() + + if(CMAKE_CONFIGURATION_TYPES) + set(_launcher_build_type "${CMAKE_BUILD_TYPE}") + else() + unset(_launcher_build_type) + endif() + + _launcher_configure_executable( + "${_launchermoddir}/genericlauncher.${_suffix}.in" + "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/genericlauncher.${_suffix}.in" + "${_launchername}" ${_launcher_build_type}) endfunction() function(guess_runtime_library_dirs _var) - # Start off with the link directories of the calling listfile's directory - get_directory_property(_libdirs LINK_DIRECTORIES) - - # Add additional libraries passed to the function - foreach(_lib ${ARGN}) - get_filename_component(_libdir "${_lib}" PATH) - list(APPEND _libdirs "${_libdir}") - endforeach() - - # Now, build a list of potential dll directories - set(_dlldirs) - foreach(_libdir ${_libdirs}) - # Add the libdir itself - list(APPEND _dlldirs "${_libdir}") - - # Look also in libdir/../bin since the dll might not be with the lib - get_filename_component(_libdir "${_libdir}/../bin" ABSOLUTE) - list(APPEND _dlldirs "${_libdir}") - endforeach() - - # Only keep the valid, unique directories - clean_directory_list(_dlldirs) - - # Return _dlldirs - set(${_var} "${_dlldirs}" PARENT_SCOPE) + # Start off with the link directories of the calling listfile's directory + get_directory_property(_libdirs LINK_DIRECTORIES) + + # Add additional libraries passed to the function + foreach(_lib ${ARGN}) + get_filename_component(_libdir "${_lib}" PATH) + list(APPEND _libdirs "${_libdir}") + endforeach() + + # Now, build a list of potential dll directories + set(_dlldirs) + foreach(_libdir ${_libdirs}) + # Add the libdir itself + list(APPEND _dlldirs "${_libdir}") + + # Look also in libdir/../bin since the dll might not be with the lib + get_filename_component(_libdir "${_libdir}/../bin" ABSOLUTE) + list(APPEND _dlldirs "${_libdir}") + endforeach() + + # Only keep the valid, unique directories + clean_directory_list(_dlldirs) + + # Return _dlldirs + set(${_var} + "${_dlldirs}" + PARENT_SCOPE) endfunction() + +cmake_policy(POP) diff --git a/cmake/DashboardScript.cmake.in b/cmake/DashboardScript.cmake.in index da348a8c5..52e6b22ba 100644 --- a/cmake/DashboardScript.cmake.in +++ b/cmake/DashboardScript.cmake.in @@ -13,9 +13,18 @@ # itself. (This may be every build!) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2015 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC +# +# Copyright 2014-2015, Sensics, Inc. +# Copyright 2009-2010, Iowa State University +# +# 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) +# +# SPDX-License-Identifier: BSL-1.0 cmake_minimum_required(VERSION 2.8 FATAL_ERROR) diff --git a/cmake/DoxygenTargets.cmake b/cmake/DoxygenTargets.cmake index df7c08812..a22e2794d 100644 --- a/cmake/DoxygenTargets.cmake +++ b/cmake/DoxygenTargets.cmake @@ -19,14 +19,17 @@ # Requires CMake 2.6 or newer (uses the 'function' command) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(__add_doxygen) return() diff --git a/cmake/DoxygenTargets.doxyfile.in b/cmake/DoxygenTargets.doxyfile.in index 3cf36aba6..20d17bbb5 100644 --- a/cmake/DoxygenTargets.doxyfile.in +++ b/cmake/DoxygenTargets.doxyfile.in @@ -1,3 +1,12 @@ +# Copyright 2014-2015, Sensics, Inc. +# Copyright 2009-2010, Iowa State University +# +# 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) +# +# SPDX-License-Identifier: BSL-1.0 + @INCLUDE_PATH = "@INCLUDE_PATH@" @INCLUDE = "@INCLUDE_FILE@" diff --git a/cmake/EnableExtraCompilerWarnings.cmake b/cmake/EnableExtraCompilerWarnings.cmake index 4c0e5c78d..589406239 100644 --- a/cmake/EnableExtraCompilerWarnings.cmake +++ b/cmake/EnableExtraCompilerWarnings.cmake @@ -6,20 +6,37 @@ # # # Original Author: -# 2010 Ryan Pavlik -# http://academic.cleardefinition.com -# Iowa State University HCI Graduate Program/VRAC +# 2010 Rylie Pavlik +# https://ryliepavlik.com/ +# Iowa State University - HCI Graduate Program/VRAC +# +# Additional Author: +# 2013 Kevin M. Godby +# http://kevin.godby.org/ +# Iowa State University - HCI Graduate Program/VRAC +# +# Copyright 2009-2010, Iowa State University # -# 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) +# +# SPDX-License-Identifier: BSL-1.0 if(__enable_extra_compiler_warnings) return() endif() set(__enable_extra_compiler_warnings YES) +macro(_check_warning_flag _flag _flags) + include(CheckCXXCompilerFlag) + string(REGEX REPLACE "[^A-Za-z0-9]" "" _flagvar "${_flag}") + check_cxx_compiler_flag(${_flag} SUPPORTS_WARNING_${_flagvar}) + if(SUPPORTS_WARNING_${_flagvar}) + set(_flags "${_flags} ${_flag}") + endif() +endmacro() + macro(_enable_extra_compiler_warnings_flags) set(_flags) if(MSVC) @@ -34,31 +51,51 @@ macro(_enable_extra_compiler_warnings_flags) else() include(CheckCXXCompilerFlag) set(_flags) - - check_cxx_compiler_flag(-W SUPPORTS_W_FLAG) - if(SUPPORTS_W_FLAG) - set(_flags "${_flags} -W") - endif() - - check_cxx_compiler_flag(-Wall SUPPORTS_WALL_FLAG) - if(SUPPORTS_WALL_FLAG) - set(_flags "${_flags} -Wall") - endif() - - check_cxx_compiler_flag(-Wextra SUPPORTS_WEXTRA_FLAG) - if(SUPPORTS_WEXTRA_FLAG) - set(_flags "${_flags} -Wextra") - endif() - - if(SUPPORTS_WALL_FLAG) - # At least GCC includes -Wmaybe-uninitialized in -Wall, which - # unneccesarily whines about boost::optional (by it's nature - # it's a "maybe" warning - prone to noisy false-positives) - check_cxx_compiler_flag(-Wno-maybe-uninitialized SUPPORTS_WNO_MAYBE_UNINITIALIZED_FLAG) - if(SUPPORTS_WNO_MAYBE_UNINITIALIZED_FLAG) - set(_flags "${_flags} -Wno-maybe-uninitialized") - endif() - endif() + _check_warning_flag(-W "${_flags}") + _check_warning_flag(-Wall "${_flags}") + _check_warning_flag(-pedantic "${_flags}") + _check_warning_flag(-Wbool-conversion "${_flags}") + _check_warning_flag(-Wcast-align "${_flags}") + _check_warning_flag(-Wchar-subscripts "${_flags}") + _check_warning_flag(-Wconversion "${_flags}") + _check_warning_flag(-Wdisabled-optimization "${_flags}") + _check_warning_flag(-Wdocumentation "${_flags}") + # _check_warning_flag(-Weffc++ "${_flags}") + _check_warning_flag(-Wempty-body "${_flags}") + _check_warning_flag(-Wfloat-equal "${_flags}") + _check_warning_flag(-Wformat=2 "${_flags}") + _check_warning_flag(-Wformat-security "${_flags}") + _check_warning_flag(-Wheader-guard "${_flags}") + _check_warning_flag(-Wimplicit-fallthrough "${_flags}") + _check_warning_flag(-Winit-self "${_flags}") + _check_warning_flag(-Winline "${_flags}") + _check_warning_flag(-Winvalid-pch "${_flags}") + _check_warning_flag(-Wlogical-not-parentheses "${_flags}") + _check_warning_flag(-Wloop-analysis "${_flags}") + _check_warning_flag(-Wmissing-format-attribute "${_flags}") + _check_warning_flag(-Wmissing-include-dirs "${_flags}") + _check_warning_flag(-Wno-long-long "${_flags}") + _check_warning_flag(-Wnon-virtual-dtor "${_flags}") + _check_warning_flag(-Wold-style-cast "${_flags}") + _check_warning_flag(-Wpacked "${_flags}") + _check_warning_flag(-Wpointer-arith "${_flags}") + _check_warning_flag(-Wredundant-decls "${_flags}") + _check_warning_flag(-Wshadow "${_flags}") + _check_warning_flag(-Wsizeof-array-argument "${_flags}") + _check_warning_flag(-Wstrict-overflow=4 "${_flags}") + _check_warning_flag(-Wstring-conversion "${_flags}") + _check_warning_flag(-Wsuggest-attribute=const "${_flags}") + _check_warning_flag(-Wswitch-enum "${_flags}") + _check_warning_flag(-Wswitch "${_flags}") + _check_warning_flag(-Wtrigraphs "${_flags}") + _check_warning_flag(-Wundef "${_flags}") + _check_warning_flag(-Wunique-enum "${_flags}") + _check_warning_flag(-Wuninitialized "${_flags}") + _check_warning_flag(-Wunknown-pragmas "${_flags}") + _check_warning_flag(-Wunused "${_flags}") + _check_warning_flag(-Wunused-label "${_flags}") + _check_warning_flag(-Wunused-parameter "${_flags}") + _check_warning_flag(-Wwrite-strings "${_flags}") endif() endmacro() diff --git a/cmake/EnableProfiling.cmake b/cmake/EnableProfiling.cmake index e2a340f7c..077031178 100644 --- a/cmake/EnableProfiling.cmake +++ b/cmake/EnableProfiling.cmake @@ -6,14 +6,17 @@ # # # Original Author: -# 2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(__enable_profiling) return() diff --git a/cmake/FileCopyTargets.cmake b/cmake/FileCopyTargets.cmake index 13eb11a4e..f89c6eef5 100644 --- a/cmake/FileCopyTargets.cmake +++ b/cmake/FileCopyTargets.cmake @@ -17,14 +17,17 @@ # Requires CMake 2.6 or newer (uses the 'function' command) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(__add_file_copy_target) return() diff --git a/cmake/FindALUT.cmake b/cmake/FindALUT.cmake index 48d062d70..3a2339551 100644 --- a/cmake/FindALUT.cmake +++ b/cmake/FindALUT.cmake @@ -20,14 +20,17 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(ALUT_ROOT_DIR "${ALUT_ROOT_DIR}" diff --git a/cmake/FindAdrienne.cmake b/cmake/FindAdrienne.cmake index d4f174c0c..68dbbdc67 100644 --- a/cmake/FindAdrienne.cmake +++ b/cmake/FindAdrienne.cmake @@ -35,14 +35,17 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2012 Ryan Pavlik -# http://academic.cleardefinition.com +# 2012 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2012. +# Copyright 2012, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 # Apparently Windows only. if(WIN32 OR CYGWIN) diff --git a/cmake/FindBluez.cmake b/cmake/FindBluez.cmake index f4f8e0d10..9defaf82b 100644 --- a/cmake/FindBluez.cmake +++ b/cmake/FindBluez.cmake @@ -13,14 +13,17 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(WIN32 OR APPLE OR NOT UNIX) if(NOT Bluez_FIND_QUIETLY) diff --git a/cmake/FindCPPDOM.cmake b/cmake/FindCPPDOM.cmake index 449ab73a5..c022c0cbf 100644 --- a/cmake/FindCPPDOM.cmake +++ b/cmake/FindCPPDOM.cmake @@ -26,14 +26,17 @@ # and trigger an automatic re-run. # # Original Author: -# 2009-2012 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2012 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2012. +# Copyright 2009-2012, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(_HUMAN "cppdom") set(_HEADER cppdom/cppdom.h) diff --git a/cmake/FindColibriApi.cmake b/cmake/FindColibriApi.cmake index 0d7b4ff36..a1452eb95 100644 --- a/cmake/FindColibriApi.cmake +++ b/cmake/FindColibriApi.cmake @@ -18,14 +18,17 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2009-2012 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2012 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2012. +# Copyright 2009-2012, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(COLIBRIAPI_ROOT_DIR "${COLIBRIAPI_ROOT_DIR}" diff --git a/cmake/FindDCubed.cmake b/cmake/FindDCubed.cmake index 4ca33d25f..0b8fd52d8 100644 --- a/cmake/FindDCubed.cmake +++ b/cmake/FindDCubed.cmake @@ -13,14 +13,17 @@ # DCUBED_ROOT_DIR - A directory prefix to search # (a path that contains include/ as a subdirectory) # -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(NOT BITS) if(CMAKE_SIZEOF_VOID_P MATCHES "8") diff --git a/cmake/FindDirectShow.cmake b/cmake/FindDirectShow.cmake index 1fb33061a..5882e0743 100644 --- a/cmake/FindDirectShow.cmake +++ b/cmake/FindDirectShow.cmake @@ -10,14 +10,17 @@ # Initially in VRPN - Distributed under the Boost Software License, Version 1.0. # # Almost entirely re-written by: -# 2012 Ryan Pavlik -# http://academic.cleardefinition.com +# 2012 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2012. +# Copyright 2012, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 # Look for one of the sample files. diff --git a/cmake/FindDirectX.cmake b/cmake/FindDirectX.cmake index d77ca757e..e98278c23 100644 --- a/cmake/FindDirectX.cmake +++ b/cmake/FindDirectX.cmake @@ -22,14 +22,17 @@ # SelectLibraryConfigurations # # Original Author: -# 2012 Ryan Pavlik -# http://academic.cleardefinition.com +# 2012 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2012. +# Copyright 2012, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(DIRECTX_ROOT_DIR diff --git a/cmake/FindFlagpoll.cmake b/cmake/FindFlagpoll.cmake index a016656db..d60fc1f09 100644 --- a/cmake/FindFlagpoll.cmake +++ b/cmake/FindFlagpoll.cmake @@ -29,14 +29,17 @@ # HINTS ${vpr_FLAGPOLL_INCLUDE_DIRS}) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 ### diff --git a/cmake/FindGDB.cmake b/cmake/FindGDB.cmake index e7caa190c..47693febf 100644 --- a/cmake/FindGDB.cmake +++ b/cmake/FindGDB.cmake @@ -10,14 +10,17 @@ # GDB_ROOT_DIR - A directory prefix to search # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(GDB_ROOT_DIR diff --git a/cmake/FindGHOST.cmake b/cmake/FindGHOST.cmake index 71f17ee56..ea2247d9b 100644 --- a/cmake/FindGHOST.cmake +++ b/cmake/FindGHOST.cmake @@ -8,14 +8,17 @@ # no additional modules required # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(GHOST_ROOT_DIR "${GHOST_ROOT_DIR}" diff --git a/cmake/FindGLEW.cmake b/cmake/FindGLEW.cmake index 684f6f10d..67e24f776 100644 --- a/cmake/FindGLEW.cmake +++ b/cmake/FindGLEW.cmake @@ -23,7 +23,7 @@ #============================================================================= # Copyright 2012 Benjamin Eikel -# Copyright 2016 Ryan Pavlik +# Copyright 2016 Rylie Pavlik # # Distributed under the OSI-approved BSD License (the "License"); # see below. @@ -31,6 +31,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/FindGLUI.cmake b/cmake/FindGLUI.cmake index 51797cae4..73ec19228 100644 --- a/cmake/FindGLUI.cmake +++ b/cmake/FindGLUI.cmake @@ -14,14 +14,17 @@ # (usually a path that contains include/ as a subdirectory) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(GLUI_FIND_QUIETLY) find_package(OpenGL QUIET) diff --git a/cmake/FindGLUT.cmake b/cmake/FindGLUT.cmake index 79486f07a..0ff947bd0 100644 --- a/cmake/FindGLUT.cmake +++ b/cmake/FindGLUT.cmake @@ -10,9 +10,9 @@ # GLUT_glut_LIBRARY = the full path to the glut library. #============================================================================= -# Copyright 2001-2009 Kitware, Inc. -# Copyright 2009-2010 Iowa State University -# (Author: Ryan Pavlik ) +# Copyright 2001-2009, Kitware, Inc. +# Copyright 2009-2010, Iowa State University +# (Author: Rylie Pavlik ) # # Distributed under the OSI-approved BSD License (the "License"); # see below. @@ -20,6 +20,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/FindGMTL.cmake b/cmake/FindGMTL.cmake index bdc23e4e5..15cdb76e0 100644 --- a/cmake/FindGMTL.cmake +++ b/cmake/FindGMTL.cmake @@ -24,14 +24,17 @@ # and trigger an automatic re-run. # # Original Author: -# 2009-2012 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2012 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2012. +# Copyright 2009-2012, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(_HUMAN "GMTL") set(_HEADER gmtl/gmtl.h) diff --git a/cmake/FindGPM.cmake b/cmake/FindGPM.cmake index ea70d8550..804fcc9ae 100644 --- a/cmake/FindGPM.cmake +++ b/cmake/FindGPM.cmake @@ -13,14 +13,17 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 find_library(GPM_LIBRARY NAMES gpm) diff --git a/cmake/FindGadgeteer12.cmake b/cmake/FindGadgeteer12.cmake index 42c33f8e5..a51289bb6 100644 --- a/cmake/FindGadgeteer12.cmake +++ b/cmake/FindGadgeteer12.cmake @@ -30,14 +30,17 @@ # and trigger an automatic re-run. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(_HUMAN "Gadgeteer 1.2") set(_RELEASE_NAMES gadget-1_2 libgadget-1_2) diff --git a/cmake/FindGadgeteer20.cmake b/cmake/FindGadgeteer20.cmake index f6f3b44de..c0cd5edc7 100644 --- a/cmake/FindGadgeteer20.cmake +++ b/cmake/FindGadgeteer20.cmake @@ -30,11 +30,20 @@ # and trigger an automatic re-run. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2012 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # Updated for VR Juggler 3.0 by: # Brandon Newendorp +# +# Copyright 2009-2012, Iowa State University +# Copyright 2010, Brandon Newendorp +# +# 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) +# +# SPDX-License-Identifier: BSL-1.0 set(_HUMAN "Gadgeteer 2.0") set(_FP_PKG_NAME gadgeteer) diff --git a/cmake/FindGlove5DT.cmake b/cmake/FindGlove5DT.cmake index fca626bd2..1e1aee29f 100644 --- a/cmake/FindGlove5DT.cmake +++ b/cmake/FindGlove5DT.cmake @@ -23,14 +23,17 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(GLOVE5DT_ROOT_DIR "${GLOVE5DT_ROOT_DIR}" diff --git a/cmake/FindHIDAPI.cmake b/cmake/FindHIDAPI.cmake index 646f90026..84281d9f1 100644 --- a/cmake/FindHIDAPI.cmake +++ b/cmake/FindHIDAPI.cmake @@ -1,5 +1,8 @@ -# - try to find HIDAPI library -# from http://www.signal11.us/oss/hidapi/ +#.rst: +# FindHIDAPI +# ---------- +# +# Try to find HIDAPI library, from http://www.signal11.us/oss/hidapi/ # # Cache Variables: (probably not for direct use in your scripts) # HIDAPI_INCLUDE_DIR @@ -10,37 +13,221 @@ # HIDAPI_INCLUDE_DIRS # HIDAPI_LIBRARIES # -# Requires these CMake modules: -# FindPackageHandleStandardArgs (known included with CMake >=2.6.2) +# COMPONENTS +# ^^^^^^^^^^ +# +# This module respects several COMPONENTS specifying the backend you prefer: +# ``any`` (the default), ``libusb``, and ``hidraw``. +# The availablility of the latter two depends on your platform. +# +# +# IMPORTED Targets +# ^^^^^^^^^^^^^^^^ +# +# This module defines :prop_tgt:`IMPORTED` target ``HIDAPI::hidapi`` (in all cases or +# if no components specified), ``HIDAPI::hidapi-libusb`` (if you requested the libusb component), +# and ``HIDAPI::hidapi-hidraw`` (if you requested the hidraw component), +# +# Result Variables +# ^^^^^^^^^^^^^^^^ +# +# ``HIDAPI_FOUND`` +# True if HIDAPI or the requested components (if any) were found. +# +# We recommend using the imported targets instead of the following. +# +# ``HIDAPI_INCLUDE_DIRS`` +# ``HIDAPI_LIBRARIES`` # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com -# Iowa State University HCI Graduate Program/VRAC +# 2009-2021 Rylie Pavlik +# https://ryliepavlik.com/ +# +# Copyright 2009-2010, Iowa State University +# Copyright 2019-2021, Collabora, Ltd. # -# 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) +# +# SPDX-License-Identifier: BSL-1.0 -find_library(HIDAPI_LIBRARY - NAMES hidapi hidapi-libusb) +set(HIDAPI_ROOT_DIR + "${HIDAPI_ROOT_DIR}" + CACHE PATH "Root to search for HIDAPI") -find_path(HIDAPI_INCLUDE_DIR - NAMES hidapi.h - PATH_SUFFIXES - hidapi) +# Clean up components +if(HIDAPI_FIND_COMPONENTS) + if(WIN32 OR APPLE) + # This makes no sense on Windows or Mac, which have native APIs + list(REMOVE HIDAPI_FIND_COMPONENTS libusb) + endif() -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(HIDAPI - DEFAULT_MSG - HIDAPI_LIBRARY - HIDAPI_INCLUDE_DIR) + if(NOT ${CMAKE_SYSTEM} MATCHES "Linux") + # hidraw is only on linux + list(REMOVE HIDAPI_FIND_COMPONENTS hidraw) + endif() +endif() +if(NOT HIDAPI_FIND_COMPONENTS) + # Default to any + set(HIDAPI_FIND_COMPONENTS any) +endif() + +# Ask pkg-config for hints +if(NOT ANDROID) + find_package(PkgConfig QUIET) + if(PKG_CONFIG_FOUND) + set(_old_prefix_path "${CMAKE_PREFIX_PATH}") + # So pkg-config uses HIDAPI_ROOT_DIR too. + if(HIDAPI_ROOT_DIR) + list(APPEND CMAKE_PREFIX_PATH ${HIDAPI_ROOT_DIR}) + endif() + pkg_check_modules(PC_HIDAPI_LIBUSB QUIET hidapi-libusb) + pkg_check_modules(PC_HIDAPI_HIDRAW QUIET hidapi-hidraw) + # Restore + set(CMAKE_PREFIX_PATH "${_old_prefix_path}") + endif() +endif() + +# Actually search +find_library( + HIDAPI_UNDECORATED_LIBRARY + NAMES hidapi + PATHS "${HIDAPI_ROOT_DIR}" + PATH_SUFFIXES lib) + +find_library( + HIDAPI_LIBUSB_LIBRARY + NAMES hidapi hidapi-libusb + PATHS "${HIDAPI_ROOT_DIR}" + PATH_SUFFIXES lib + HINTS ${PC_HIDAPI_LIBUSB_LIBRARY_DIRS}) +if(CMAKE_SYSTEM MATCHES "Linux") + find_library( + HIDAPI_HIDRAW_LIBRARY + NAMES hidapi-hidraw + HINTS ${PC_HIDAPI_HIDRAW_LIBRARY_DIRS}) +endif() + +find_path( + HIDAPI_INCLUDE_DIR + NAMES hidapi.h + PATHS "${HIDAPI_ROOT_DIR}" + PATH_SUFFIXES hidapi include include/hidapi + HINTS ${PC_HIDAPI_HIDRAW_INCLUDE_DIRS} ${PC_HIDAPI_LIBUSB_INCLUDE_DIRS}) + +find_package(Threads QUIET) + +### +# Compute the "I don't care which backend" library +### +set(HIDAPI_LIBRARY) + +# First, try to use a preferred backend if supplied +if("${HIDAPI_FIND_COMPONENTS}" MATCHES "libusb" + AND HIDAPI_LIBUSB_LIBRARY + AND NOT HIDAPI_LIBRARY) + set(HIDAPI_LIBRARY ${HIDAPI_LIBUSB_LIBRARY}) +endif() +if("${HIDAPI_FIND_COMPONENTS}" MATCHES "hidraw" + AND HIDAPI_HIDRAW_LIBRARY + AND NOT HIDAPI_LIBRARY) + set(HIDAPI_LIBRARY ${HIDAPI_HIDRAW_LIBRARY}) +endif() + +# Then, if we don't have a preferred one, settle for anything. +if(NOT HIDAPI_LIBRARY) + if(HIDAPI_LIBUSB_LIBRARY) + set(HIDAPI_LIBRARY ${HIDAPI_LIBUSB_LIBRARY}) + elseif(HIDAPI_HIDRAW_LIBRARY) + set(HIDAPI_LIBRARY ${HIDAPI_HIDRAW_LIBRARY}) + elseif(HIDAPI_UNDECORATED_LIBRARY) + set(HIDAPI_LIBRARY ${HIDAPI_UNDECORATED_LIBRARY}) + endif() +endif() + +### +# Determine if the various requested components are found. +### +set(_hidapi_component_required_vars) + +foreach(_comp IN LISTS HIDAPI_FIND_COMPONENTS) + if("${_comp}" STREQUAL "any") + list(APPEND _hidapi_component_required_vars HIDAPI_INCLUDE_DIR + HIDAPI_LIBRARY) + if(HIDAPI_INCLUDE_DIR AND EXISTS "${HIDAPI_LIBRARY}") + set(HIDAPI_any_FOUND TRUE) + mark_as_advanced(HIDAPI_INCLUDE_DIR) + else() + set(HIDAPI_any_FOUND FALSE) + endif() + + elseif("${_comp}" STREQUAL "libusb") + list(APPEND _hidapi_component_required_vars HIDAPI_INCLUDE_DIR + HIDAPI_LIBUSB_LIBRARY) + if(HIDAPI_INCLUDE_DIR AND EXISTS "${HIDAPI_LIBUSB_LIBRARY}") + set(HIDAPI_libusb_FOUND TRUE) + mark_as_advanced(HIDAPI_INCLUDE_DIR HIDAPI_LIBUSB_LIBRARY) + else() + set(HIDAPI_libusb_FOUND FALSE) + endif() + + elseif("${_comp}" STREQUAL "hidraw") + list(APPEND _hidapi_component_required_vars HIDAPI_INCLUDE_DIR + HIDAPI_HIDRAW_LIBRARY) + if(HIDAPI_INCLUDE_DIR AND EXISTS "${HIDAPI_HIDRAW_LIBRARY}") + set(HIDAPI_hidraw_FOUND TRUE) + mark_as_advanced(HIDAPI_INCLUDE_DIR HIDAPI_HIDRAW_LIBRARY) + else() + set(HIDAPI_hidraw_FOUND FALSE) + endif() + + else() + message(WARNING "${_comp} is not a recognized HIDAPI component") + set(HIDAPI_${_comp}_FOUND FALSE) + endif() +endforeach() +unset(_comp) + +### +# FPHSA call +### +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args( + HIDAPI + REQUIRED_VARS ${_hidapi_component_required_vars} THREADS_FOUND + HANDLE_COMPONENTS) if(HIDAPI_FOUND) - set(HIDAPI_LIBRARIES "${HIDAPI_LIBRARY}") + set(HIDAPI_LIBRARIES "${HIDAPI_LIBRARY}") + set(HIDAPI_INCLUDE_DIRS "${HIDAPI_INCLUDE_DIR}") + if(NOT TARGET HIDAPI::hidapi) + add_library(HIDAPI::hidapi UNKNOWN IMPORTED) + set_target_properties( + HIDAPI::hidapi + PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES "C" + IMPORTED_LOCATION "${HIDAPI_LIBRARY}" + INTERFACE_INCLUDE_DIRECTORIES "${HIDAPI_INCLUDE_DIR}" + IMPORTED_LINK_INTERFACE_LIBRARIES Threads::Threads) + endif() +endif() - set(HIDAPI_INCLUDE_DIRS "${HIDAPI_INCLUDE_DIR}") +if(HIDAPI_libusb_FOUND AND NOT TARGET HIDAPI::hidapi-libusb) + add_library(HIDAPI::hidapi-libusb UNKNOWN IMPORTED) + set_target_properties( + HIDAPI::hidapi-libusb + PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES "C" + IMPORTED_LOCATION "${HIDAPI_LIBUSB_LIBRARY}" + INTERFACE_INCLUDE_DIRECTORIES "${HIDAPI_INCLUDE_DIR}" + IMPORTED_LINK_INTERFACE_LIBRARIES Threads::Threads) endif() -mark_as_advanced(HIDAPI_INCLUDE_DIR HIDAPI_LIBRARY) +if(HIDAPI_hidraw_FOUND AND NOT TARGET HIDAPI::hidapi-hidraw) + add_library(HIDAPI::hidapi-hidraw UNKNOWN IMPORTED) + set_target_properties( + HIDAPI::hidapi-hidraw + PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES "C" + IMPORTED_LOCATION "${HIDAPI_HIDRAW_LIBRARY}" + INTERFACE_INCLUDE_DIRECTORIES "${HIDAPI_INCLUDE_DIR}" + IMPORTED_LINK_INTERFACE_LIBRARIES Threads::Threads) +endif() diff --git a/cmake/FindIDLJ.cmake b/cmake/FindIDLJ.cmake index 04def2212..f86ad37b6 100644 --- a/cmake/FindIDLJ.cmake +++ b/cmake/FindIDLJ.cmake @@ -27,14 +27,17 @@ # to appear in your IDE, but it is not necessary. # # Original Author: -# 2012 Ryan Pavlik -# http://academic.cleardefinition.com +# 2012 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2012. +# Copyright 2012, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(NOT JAVA_FOUND) find_package(Java QUIET) diff --git a/cmake/FindInterSense.cmake b/cmake/FindInterSense.cmake index 855c9a1d2..f75bb5463 100644 --- a/cmake/FindInterSense.cmake +++ b/cmake/FindInterSense.cmake @@ -18,15 +18,19 @@ # http://wemarsh.com/ # Kognitiv Neuroinformatik, Universität Bremen # -# (building on Ryan Pavlik's templates) +# (building on Rylie Pavlik's templates) # -# 2013 Ryan Pavlik -# http://academic.cleardefinition.com +# 2013 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # +# Copyright 2013, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(INTERSENSE_ROOT_DIR "${INTERSENSE_ROOT_DIR}" diff --git a/cmake/FindJCCL12.cmake b/cmake/FindJCCL12.cmake index a936c945c..7b24edbfa 100644 --- a/cmake/FindJCCL12.cmake +++ b/cmake/FindJCCL12.cmake @@ -29,14 +29,17 @@ # and trigger an automatic re-run. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(_HUMAN "JCCL 1.2") diff --git a/cmake/FindJCCL14.cmake b/cmake/FindJCCL14.cmake index 147bb0122..3dd8e53a2 100644 --- a/cmake/FindJCCL14.cmake +++ b/cmake/FindJCCL14.cmake @@ -29,11 +29,20 @@ # and trigger an automatic re-run. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2012 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # Updated for VR Juggler 3.0 by: # Brandon Newendorp +# +# Copyright 2009-2012, Iowa State University +# Copyright 2010, Brandon Newendorp +# +# 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) +# +# SPDX-License-Identifier: BSL-1.0 set(_HUMAN "JCCL 1.4") diff --git a/cmake/FindJsonCpp.cmake b/cmake/FindJsonCpp.cmake index 28fca2f9f..daf9a55a7 100644 --- a/cmake/FindJsonCpp.cmake +++ b/cmake/FindJsonCpp.cmake @@ -22,15 +22,18 @@ # JSONCPP_FOUND - True if JsonCpp was found. # # Original Author: -# 2016 Ryan Pavlik +# 2016 Rylie Pavlik # Incorporates work from the module contributed to VRPN under the same license: # 2011 Philippe Crassous (ENSAM ParisTech / Institut Image) p.crassous _at_ free.fr # -# Copyright Philippe Crassous 2011. -# Copyright Sensics, Inc. 2016. +# Copyright 2011, Philippe Crassous +# Copyright 2016, Sensics, Inc. +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(__jsoncpp_have_namespaced_targets OFF) set(__jsoncpp_have_interface_support OFF) @@ -84,7 +87,7 @@ if(jsoncpp_FOUND) set_property(TARGET ${target} APPEND PROPERTY MAP_IMPORTED_CONFIG_RELEASE RELEASE RELWITHDEBINFO MINSIZEREL NONE ${_jsoncpp_debug_fallback}) set_property(TARGET ${target} APPEND PROPERTY MAP_IMPORTED_CONFIG_RELWITHDEBINFO RELWITHDEBINFO RELEASE MINSIZEREL NONE ${_jsoncpp_debug_fallback}) set_property(TARGET ${target} APPEND PROPERTY MAP_IMPORTED_CONFIG_MINSIZEREL MINSIZEREL RELEASE RELWITHDEBINFO NONE ${_jsoncpp_debug_fallback}) - set_property(TARGET ${target} APPEND PROPERTY MAP_IMPORTED_CONFIG_NONE RELEASE RELWITHDEBINFO MINSIZEREL ${_jsoncpp_debug_fallback}) + set_property(TARGET ${target} APPEND PROPERTY MAP_IMPORTED_CONFIG_NONE NONE RELEASE RELWITHDEBINFO MINSIZEREL ${_jsoncpp_debug_fallback}) if(NOT MSVC) set_property(TARGET ${target} APPEND PROPERTY MAP_IMPORTED_CONFIG_DEBUG DEBUG RELWITHDEBINFO RELEASE MINSIZEREL NONE) endif() diff --git a/cmake/FindJtTk.cmake b/cmake/FindJtTk.cmake index 9ef214157..5cf576c70 100644 --- a/cmake/FindJtTk.cmake +++ b/cmake/FindJtTk.cmake @@ -18,14 +18,17 @@ # (a path that contains include/ as a subdirectory) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 include(ListCombinations) include(CheckVersion) diff --git a/cmake/FindJtTk.stampkey.cmake.in b/cmake/FindJtTk.stampkey.cmake.in index 53985d26f..062877994 100644 --- a/cmake/FindJtTk.stampkey.cmake.in +++ b/cmake/FindJtTk.stampkey.cmake.in @@ -1,9 +1,17 @@ # Small script to stamp the JtTk license key on an executable # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC +# +# Copyright 2009-2010, Iowa State University +# +# 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) +# +# SPDX-License-Identifier: BSL-1.0 set(ENV{JTTK_DEV_PLATFORM} @BITS@) set(ENV{JTTK_DEV_PATH} @JTTK_DEV_PATH@) diff --git a/cmake/FindLAPACKLibs.cmake b/cmake/FindLAPACKLibs.cmake index 51d0c41dd..cba998c0d 100644 --- a/cmake/FindLAPACKLibs.cmake +++ b/cmake/FindLAPACKLibs.cmake @@ -7,14 +7,17 @@ # LAPACKLIBS_ROOT_DIR, location to start searching for LAPACK libraries # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(_check) diff --git a/cmake/FindLibFreespace.cmake b/cmake/FindLibFreespace.cmake index b83e837bb..ddd841112 100644 --- a/cmake/FindLibFreespace.cmake +++ b/cmake/FindLibFreespace.cmake @@ -13,13 +13,16 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2014 Ryan Pavlik -# http://academic.cleardefinition.com +# 2014 Rylie Pavlik +# https://ryliepavlik.com/ +# +# Copyright 2014, Sensics, Inc. # -# Copyright Sensics, Inc. 2014. # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(LIBFREESPACE_ROOT_DIR "${LIBFREESPACE_ROOT_DIR}" diff --git a/cmake/FindLibusb1.cmake b/cmake/FindLibusb1.cmake index b161c81e0..295245a54 100644 --- a/cmake/FindLibusb1.cmake +++ b/cmake/FindLibusb1.cmake @@ -14,11 +14,14 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com -# Iowa State University HCI Graduate Program/VRAC +# 2009-2021 Rylie Pavlik +# https://ryliepavlik.com/ +# +# Copyright 2009-2010, Iowa State University +# Copyright 2021, Collabora, Ltd. +# +# SPDX-License-Identifier: BSL-1.0 # -# 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) @@ -46,9 +49,11 @@ if(WIN32) endif() else() set(_lib_suffixes) - find_package(PkgConfig QUIET) - if(PKG_CONFIG_FOUND) - pkg_check_modules(PC_LIBUSB1 libusb-1.0) + if(NOT ANDROID) + find_package(PkgConfig QUIET) + if(PKG_CONFIG_FOUND) + pkg_check_modules(PC_LIBUSB1 QUIET libusb-1.0) + endif() endif() endif() diff --git a/cmake/FindLuabind.cmake b/cmake/FindLuabind.cmake index 29062d3af..cdf2408c8 100644 --- a/cmake/FindLuabind.cmake +++ b/cmake/FindLuabind.cmake @@ -13,14 +13,17 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(LUABIND_ROOT_DIR "${LUABIND_ROOT_DIR}" diff --git a/cmake/FindLyX.cmake b/cmake/FindLyX.cmake index 7ec33b78d..af4b4c509 100644 --- a/cmake/FindLyX.cmake +++ b/cmake/FindLyX.cmake @@ -27,14 +27,17 @@ # LYX_ROOT_DIR - A directory prefix to search # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(LYX_ROOT_DIR diff --git a/cmake/FindMacHID.cmake b/cmake/FindMacHID.cmake index d96baceb5..cd77781f4 100644 --- a/cmake/FindMacHID.cmake +++ b/cmake/FindMacHID.cmake @@ -18,14 +18,17 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(APPLE) find_library(MACHID_CoreFoundation_LIBRARY CoreFoundation) diff --git a/cmake/FindMarkdown.cmake b/cmake/FindMarkdown.cmake index 63b930532..5daef6ac9 100644 --- a/cmake/FindMarkdown.cmake +++ b/cmake/FindMarkdown.cmake @@ -10,14 +10,17 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2011 Ryan Pavlik -# http://academic.cleardefinition.com +# 2011 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2011. +# Copyright 2011, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 file(TO_CMAKE_PATH "${MARKDOWN_ROOT_DIR}" MARKDOWN_ROOT_DIR) set(MARKDOWN_ROOT_DIR diff --git a/cmake/FindOVR.cmake b/cmake/FindOVR.cmake index fa1473f7c..d92bc2350 100644 --- a/cmake/FindOVR.cmake +++ b/cmake/FindOVR.cmake @@ -16,9 +16,13 @@ # Original Author: # 2014 Kevin M. Godby # +# Copyright 2014, Kevin M. Godby +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(OVR_ROOT_DIR "${OVR_ROOT_DIR}" diff --git a/cmake/FindOpenCV1.cmake b/cmake/FindOpenCV1.cmake deleted file mode 100644 index 148af568f..000000000 --- a/cmake/FindOpenCV1.cmake +++ /dev/null @@ -1,245 +0,0 @@ -# - Try to find OpenCV library installation -# See http://sourceforge.net/projects/opencvlibrary/ -# -# The following variable is optionally searched for defaults -# OPENCV_ROOT_DIR: Base directory of OpenCv tree to use. -# -# OPENCV_NEW_LIBRARY_NAMES Set to YES before searching if you want to -# The following are set after configuration is done: -# OPENCV_FOUND -# OPENCV_INCLUDE_DIRS -# OPENCV_LIBRARIES -# -# 2004/05 Jan Woetzel, Friso, Daniel Grest -# 2006/01 complete rewrite by Jan Woetzel -# 2006/09 2nd rewrite introducing ROOT_DIR and PATH_SUFFIXES -# to handle multiple installed versions gracefully by Jan Woetzel -# 2010/02 Ryan Pavlik (Iowa State University) - partial rewrite to standardize -# -# tested with: -# -OpenCV 0.97 (beta5a): MSVS 7.1, gcc 3.3, gcc 4.1 -# -OpenCV 0.99 (1.0rc1): MSVS 7.1 -# -# www.mip.informatik.uni-kiel.de/~jw -# academic.cleardefinition.com -# -------------------------------- - -set(OPENCV_ROOT_DIR - "${OPENCV_ROOT_DIR}" - CACHE - PATH - "Path to search for OpenCV") - -find_package(OpenCV QUIET NO_MODULE) -if(OpenCV_LIBS AND NOT OpenCV_LIBRARIES) - set(OPENCV_LIBRARIES ${OpenCV_LIBS}) - set(OPENCV_FOUND true) -else() - include(ProgramFilesGlob) - - # typical root dirs of installations, exactly one of them is used - program_files_glob(_dirs "/OpenCV*/") - - # - # select exactly ONE OPENCV base directory/tree - # to avoid mixing different version headers and libs - # - find_path(OPENCV_BASE_DIR - NAMES - cv/include/cv.h - include/opencv/cv.h - include/cv/cv.h - include/cv.h - HINTS - "${OPENCV_ROOT_DIR}" - "$ENV{OPENCV_ROOT_DIR}" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Intel(R) Open Source Computer Vision Library_is1;Inno Setup: App Path]" - ${_dirs}) - - - - - # header include dir suffixes appended to OPENCV_BASE_DIR - set(OPENCV_INCDIR_SUFFIXES - include - include/cv - include/opencv - cv/include - cxcore/include - cvaux/include - otherlibs/cvcam/include - otherlibs/highgui - otherlibs/highgui/include - otherlibs/_graphics/include) - - # library linkdir suffixes appended to OPENCV_BASE_DIR - set(OPENCV_LIBDIR_SUFFIXES - lib - lib64 - OpenCV/lib - otherlibs/_graphics/lib) - - - # - # find incdir for each lib - # - find_path(OPENCV_cv_INCLUDE_DIR - NAMES - cv.h - HINTS - "${OPENCV_BASE_DIR}" - "${OPENCV_ROOT_DIR}" - PATH_SUFFIXES - ${OPENCV_INCDIR_SUFFIXES}) - find_path(OPENCV_cxcore_INCLUDE_DIR - NAMES - cxcore.h - HINTS - "${OPENCV_BASE_DIR}" - "${OPENCV_ROOT_DIR}" - PATH_SUFFIXES - ${OPENCV_INCDIR_SUFFIXES}) - find_path(OPENCV_cxcore_INCLUDE_DIR - NAMES - cvaux.h - HINTS - "${OPENCV_BASE_DIR}" - "${OPENCV_ROOT_DIR}" - PATH_SUFFIXES - ${OPENCV_INCDIR_SUFFIXES}) - find_path(OPENCV_highgui_INCLUDE_DIR - NAMES - highgui.h - HINTS - "${OPENCV_BASE_DIR}" - "${OPENCV_ROOT_DIR}" - PATH_SUFFIXES - ${OPENCV_INCDIR_SUFFIXES}) - find_path(OPENCV_cvcam_INCLUDE_DIR - NAMES - cvcam.h - HINTS - "${OPENCV_BASE_DIR}" - "${OPENCV_ROOT_DIR}" - PATH_SUFFIXES - ${OPENCV_INCDIR_SUFFIXES}) - - # - # find sbsolute path to all libraries - # some are optionally, some may not exist on Linux - # - find_library(OPENCV_legacy_LIBRARY - NAMES - opencv_legacy - HINTS - "${OPENCV_BASE_DIR}" - "${OPENCV_ROOT_DIR}" - PATH_SUFFIXES - ${OPENCV_LIBDIR_SUFFIXES}) - - set(OPENCV_NEW_COMPONENTS calib3d contrib core features2d highgui imgproc legacy ml objdetect video) - set(OPENCV_OLD_COMPONENTS cv cvaux cvcam cvhaartraining cxcore cxts highgui ml trs) - set(opencv_components) - if(OPENCV_NEW_LIBRARY_NAMES OR OPENCV_legacy_LIBRARY) - - # New-style library names - foreach(component ${OPENCV_NEW_COMPONENTS}) - find_library(OPENCV_${component}_LIBRARY - NAMES - opencv_${component} - HINTS - ${OPENCV_BASE_DIR} - PATH_SUFFIXES - ${OPENCV_LIBDIR_SUFFIXES}) - endforeach() - - # cv components with header and library if COMPONENTS unspecified - if(NOT OpenCV_FIND_COMPONENTS) - # default - set(opencv_components core legacy imgproc highgui) - if(WIN32) - list(APPEND opencv_components video) # WIN32 only actually - endif() - else() - # TODO: clean up/convert to new components - string(TOLOWER "${OpenCV_FIND_COMPONENTS}" opencv_components) - endif() - - else() - # Old-style lib names - if(NOT OpenCV_FIND_COMPONENTS) - # default - set(opencv_components cv cxcore cvaux highgui) - if(WIN32) - list(APPEND opencv_components cvcam) # WIN32 only actually - endif() - else() - string(TOLOWER "${OpenCV_FIND_COMPONENTS}" opencv_components) - endif() - - foreach(component ${OPENCV_OLD_COMPONENTS}) - find_library(OPENCV_${component}_LIBRARY - NAMES - ${component} - HINTS - ${OPENCV_BASE_DIR} - PATH_SUFFIXES - ${OPENCV_LIBDIR_SUFFIXES}) - endforeach() - endif() - - # - # Logic selecting required libs and headers - # - - set(_req_check) - set(_req_libs) - set(_req_includes) - foreach(component ${opencv_components}) - #message(STATUS "Component requested: ${component}") - - # only good if header and library both found - list(APPEND - _req_check - OPENCV_${component}_LIBRARY) - list(APPEND _req_libs "${OPENCV_${component}_LIBRARY}") - if(DEFINED OPENCV_${component}_INCLUDE_DIR) - list(APPEND - _req_check - OPENCV_${component}_INCLUDE_DIR) - list(APPEND _req_includes "${OPENCV_${component}_INCLUDE_DIR}") - endif() - - - endforeach() - - # handle the QUIETLY and REQUIRED arguments and set xxx_FOUND to TRUE if - # all listed variables are TRUE - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(OpenCV - DEFAULT_MSG - OPENCV_cv_INCLUDE_DIR - ${_req_check}) - - if(OPENCV_FOUND) - set(OPENCV_LIBRARY_DIRS) - foreach(lib ${_req_libs}) - get_filename_component(dir "${lib}" PATH) - list(APPEND OPENCV_LIBRARY_DIRS "${dir}") - endforeach() - list(REVERSE OPENCV_LIBRARY_DIRS) - list(REMOVE_DUPLICATES OPENCV_LIBRARY_DIRS) - list(REVERSE OPENCV_LIBRARY_DIRS) - - set(OPENCV_INCLUDE_DIRS ${_req_includes}) - set(OPENCV_LIBRARIES ${_req_libs}) - mark_as_advanced(OPENCV_ROOT_DIR OpenCV_DIR) - endif() - - mark_as_advanced(OPENCV_BASE_DIR) - foreach(component ${OPENCV_NEW_COMPONENTS} ${OPENCV_OLD_COMPONENTS}) - mark_as_advanced(OPENCV_${component}_LIBRARY OPENCV_${component}_INCLUDE_DIR) - endforeach() -endif() - - diff --git a/cmake/FindOpenHaptics.cmake b/cmake/FindOpenHaptics.cmake index 0e4958c5f..88943269b 100644 --- a/cmake/FindOpenHaptics.cmake +++ b/cmake/FindOpenHaptics.cmake @@ -44,14 +44,17 @@ # CMake 2.6.3 (uses "unset") # # Original Author: -# 2009-2012 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2012 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 cmake_minimum_required(VERSION 2.6.3) diff --git a/cmake/FindParasolid.cmake b/cmake/FindParasolid.cmake index 17636d702..e56accf1a 100644 --- a/cmake/FindParasolid.cmake +++ b/cmake/FindParasolid.cmake @@ -18,14 +18,17 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 include(ListCombinations) include(CheckVersion) diff --git a/cmake/FindPerformer.cmake b/cmake/FindPerformer.cmake index db2b9c5cc..4c87b44f1 100644 --- a/cmake/FindPerformer.cmake +++ b/cmake/FindPerformer.cmake @@ -20,14 +20,17 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2012 Ryan Pavlik -# http://academic.cleardefinition.com +# 2012 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2012. +# Copyright 2012, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(PERFORMER_ROOT_DIR "${PERFORMER_ROOT_DIR}" diff --git a/cmake/FindPerlModules.cmake b/cmake/FindPerlModules.cmake index f09ff851d..cde314de0 100644 --- a/cmake/FindPerlModules.cmake +++ b/cmake/FindPerlModules.cmake @@ -7,14 +7,17 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2012 Ryan Pavlik -# http://academic.cleardefinition.com +# 2012 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2012. +# Copyright 2012, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(NOT PERL_FOUND) find_package(Perl QUIET) diff --git a/cmake/FindQVRPN.cmake b/cmake/FindQVRPN.cmake index 37e1af2b9..56b177eaa 100644 --- a/cmake/FindQVRPN.cmake +++ b/cmake/FindQVRPN.cmake @@ -21,14 +21,17 @@ # Juan Sebastian Casallas # # FindVRPN.cmake Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2012. +# Copyright 2009-2012, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(QVRPN_ROOT_DIR "${QVRPN_ROOT_DIR}" diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake index f69c68a13..76f59a831 100644 --- a/cmake/FindSDL2.cmake +++ b/cmake/FindSDL2.cmake @@ -7,12 +7,15 @@ # SDL2_DYNAMIC - If we found a DLL version of SDL (meaning you might want to copy a DLL from SDL2::SDL2) # # Original Author: -# 2015 Ryan Pavlik +# 2015 Rylie Pavlik +# +# Copyright 2015, Sensics, Inc. # -# Copyright Sensics, Inc. 2015. # 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) +# +# SPDX-License-Identifier: BSL-1.0 # Set up architectures (for windows) and prefixes (for mingw builds) if(WIN32) diff --git a/cmake/FindSonix12.cmake b/cmake/FindSonix12.cmake index 0ab159961..6ed0e2d1e 100644 --- a/cmake/FindSonix12.cmake +++ b/cmake/FindSonix12.cmake @@ -29,14 +29,17 @@ # and trigger an automatic re-run. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(_HUMAN "Sonix 1.2") diff --git a/cmake/FindSonix14.cmake b/cmake/FindSonix14.cmake index 692216fdf..da736397f 100644 --- a/cmake/FindSonix14.cmake +++ b/cmake/FindSonix14.cmake @@ -29,11 +29,20 @@ # and trigger an automatic re-run. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2012 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # Updated for VR Juggler 3.0 by: # Brandon Newendorp +# +# Copyright 2009-2012, Iowa State University +# Copyright 2010, Brandon Newendorp +# +# 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) +# +# SPDX-License-Identifier: BSL-1.0 set(_HUMAN "Sonix 1.4") diff --git a/cmake/FindTR1.cmake b/cmake/FindTR1.cmake index 82bb1db50..e6658b130 100644 --- a/cmake/FindTR1.cmake +++ b/cmake/FindTR1.cmake @@ -11,14 +11,17 @@ # substitute for them. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 # If we were sought quietly, any dependencies should be quiet as well if(TR1_FIND_QUIETLY) diff --git a/cmake/FindTooN.cmake b/cmake/FindTooN.cmake index 1dda1de68..de6dff094 100644 --- a/cmake/FindTooN.cmake +++ b/cmake/FindTooN.cmake @@ -15,14 +15,17 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(TOON_ROOT_DIR "${TOON_ROOT_DIR}" diff --git a/cmake/FindTooNtag.cmake b/cmake/FindTooNtag.cmake index 76e790660..c7e93d90e 100644 --- a/cmake/FindTooNtag.cmake +++ b/cmake/FindTooNtag.cmake @@ -16,14 +16,17 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(TOONTAG_ROOT_DIR "${TOONTAG_ROOT_DIR}" diff --git a/cmake/FindTweek12.cmake b/cmake/FindTweek12.cmake index 47b9a5e1a..0db16f700 100644 --- a/cmake/FindTweek12.cmake +++ b/cmake/FindTweek12.cmake @@ -29,14 +29,17 @@ # and trigger an automatic re-run. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(_HUMAN "Tweek 1.2") diff --git a/cmake/FindTweek14.cmake b/cmake/FindTweek14.cmake index c6e1e5b2d..76e0750a8 100644 --- a/cmake/FindTweek14.cmake +++ b/cmake/FindTweek14.cmake @@ -29,11 +29,20 @@ # and trigger an automatic re-run. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2012 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # Updated for VR Juggler 3.0 by: # Brandon Newendorp +# +# Copyright 2009-2012, Iowa State University +# Copyright 2010, Brandon Newendorp +# +# 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) +# +# SPDX-License-Identifier: BSL-1.0 set(_HUMAN "Tweek 1.4") diff --git a/cmake/FindVPR20.cmake b/cmake/FindVPR20.cmake index 03eb12dc6..975d0e11c 100644 --- a/cmake/FindVPR20.cmake +++ b/cmake/FindVPR20.cmake @@ -33,14 +33,17 @@ # and trigger an automatic re-run. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(_HUMAN "VPR 2.0") set(_RELEASE_NAMES vpr-2_0 libvpr-2_0) diff --git a/cmake/FindVPR22.cmake b/cmake/FindVPR22.cmake index d9ab26ff6..064fc8e9a 100644 --- a/cmake/FindVPR22.cmake +++ b/cmake/FindVPR22.cmake @@ -33,11 +33,20 @@ # and trigger an automatic re-run. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2012 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # Updated for VR Juggler 3.0 by: # Brandon Newendorp +# +# Copyright 2009-2012, Iowa State University +# Copyright 2010, Brandon Newendorp +# +# 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) +# +# SPDX-License-Identifier: BSL-1.0 set(_HUMAN "VPR 2.2") set(_FP_PKG_NAME vpr) diff --git a/cmake/FindVPS.cmake b/cmake/FindVPS.cmake index c2b52c03a..950218d0b 100644 --- a/cmake/FindVPS.cmake +++ b/cmake/FindVPS.cmake @@ -13,14 +13,17 @@ # (a path that contains include/ as a subdirectory) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 include(SelectLibraryConfigurations) include(ListCombinations) diff --git a/cmake/FindVRJ22.cmake b/cmake/FindVRJ22.cmake index 7a291f0a4..7cca20622 100644 --- a/cmake/FindVRJ22.cmake +++ b/cmake/FindVRJ22.cmake @@ -32,14 +32,17 @@ # and trigger an automatic re-run. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(_HUMAN "VR Juggler 2.2 Core") diff --git a/cmake/FindVRJ30.cmake b/cmake/FindVRJ30.cmake index 30091bccf..38f04d508 100644 --- a/cmake/FindVRJ30.cmake +++ b/cmake/FindVRJ30.cmake @@ -32,16 +32,20 @@ # and trigger an automatic re-run. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2012 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # Updated for VR Juggler 3.0 by: # Brandon Newendorp # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2012, Iowa State University +# Copyright 2010, Brandon Newendorp +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(_HUMAN "VR Juggler 3.0 Core") diff --git a/cmake/FindVRJOGL22.cmake b/cmake/FindVRJOGL22.cmake index 7f0aafd8d..8702c1c91 100644 --- a/cmake/FindVRJOGL22.cmake +++ b/cmake/FindVRJOGL22.cmake @@ -30,14 +30,17 @@ # and trigger an automatic re-run. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(_HUMAN "VR Juggler 2.2 OpenGL Core") diff --git a/cmake/FindVRJOGL30.cmake b/cmake/FindVRJOGL30.cmake index 780e2c335..5186f5cf8 100644 --- a/cmake/FindVRJOGL30.cmake +++ b/cmake/FindVRJOGL30.cmake @@ -30,11 +30,20 @@ # and trigger an automatic re-run. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2012 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # Updated for VR Juggler 3.0 by: # Brandon Newendorp +# +# Copyright 2009-2012, Iowa State University +# Copyright 2010, Brandon Newendorp +# +# 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) +# +# SPDX-License-Identifier: BSL-1.0 set(_HUMAN "VR Juggler 3.0 OpenGL Core") diff --git a/cmake/FindVRJuggler.cmake b/cmake/FindVRJuggler.cmake index c794d0906..a435fcd2b 100644 --- a/cmake/FindVRJuggler.cmake +++ b/cmake/FindVRJuggler.cmake @@ -51,16 +51,19 @@ # and trigger an automatic re-run. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # Updated for VR Juggler 3.0 by: # Brandon Newendorp # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 include(CleanLibraryList) include(CleanDirectoryList) diff --git a/cmake/FindVRJuggler22.cmake b/cmake/FindVRJuggler22.cmake index db9b3a22e..b02759b4b 100644 --- a/cmake/FindVRJuggler22.cmake +++ b/cmake/FindVRJuggler22.cmake @@ -53,14 +53,17 @@ # and trigger an automatic re-run. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 include(CleanLibraryList) include(CleanDirectoryList) diff --git a/cmake/FindVRJuggler30.cmake b/cmake/FindVRJuggler30.cmake index 4d28f015b..140ce68f9 100644 --- a/cmake/FindVRJuggler30.cmake +++ b/cmake/FindVRJuggler30.cmake @@ -53,16 +53,20 @@ # and trigger an automatic re-run. # # Original Author: -# 2009-2011 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2013 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # Updated for VR Juggler 3.0 by: -# Brandon Newendorp and Ryan Pavlik +# Brandon Newendorp and Rylie Pavlik +# +# Copyright 2009-2013, Iowa State University +# Copyright 2010, Brandon Newendorp # -# 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) +# +# SPDX-License-Identifier: BSL-1.0 include(CleanLibraryList) include(CleanDirectoryList) diff --git a/cmake/FindVRPN.cmake b/cmake/FindVRPN.cmake index 641b62b70..55b82c8a0 100644 --- a/cmake/FindVRPN.cmake +++ b/cmake/FindVRPN.cmake @@ -19,14 +19,17 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2009-2012 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2012 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2012. +# Copyright 2009-2012, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(VRPN_ROOT_DIR "${VRPN_ROOT_DIR}" diff --git a/cmake/FindViewPoint.cmake b/cmake/FindViewPoint.cmake index a18b6145d..9924b5f2b 100644 --- a/cmake/FindViewPoint.cmake +++ b/cmake/FindViewPoint.cmake @@ -16,14 +16,17 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2012 Ryan Pavlik -# http://academic.cleardefinition.com +# 2012 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2012. +# Copyright 2012, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(VIEWPOINT_ROOT_DIR "${VIEWPOINT_ROOT_DIR}" diff --git a/cmake/FindVirtuoseAPI.cmake b/cmake/FindVirtuoseAPI.cmake index 639d00dd4..82c599ee1 100644 --- a/cmake/FindVirtuoseAPI.cmake +++ b/cmake/FindVirtuoseAPI.cmake @@ -5,6 +5,14 @@ # VIRTUOSEAPI_FOUND, If false, do not try to use this library # VIRTUOSEAPI_RUNTIME_LIBRARY_DIRS, path to DLL/SO for runtime use. # VIRTUOSEAPI_RUNTIME_LIBRARIES, runtime libraries you might want to install +# +# Copyright 2010, Iowa State University +# +# 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) +# +# SPDX-License-Identifier: BSL-1.0 set(VIRTUOSEAPI_ROOT_DIR "${VIRTUOSEAPI_ROOT_DIR}" diff --git a/cmake/FindVirtuoseVPP.cmake b/cmake/FindVirtuoseVPP.cmake index 0cd45fc1e..b500ed7ec 100644 --- a/cmake/FindVirtuoseVPP.cmake +++ b/cmake/FindVirtuoseVPP.cmake @@ -7,6 +7,14 @@ # VIRTUOSEVPP_FOUND, If false, do not try to use this library # VIRTUOSEVPP_RUNTIME_LIBRARY_DIRS, path to DLL/SO for runtime use. # VIRTUOSEAPI_RUNTIME_LIBRARIES, runtime libraries you might want to install +# +# Copyright 2010, Iowa State University +# +# 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) +# +# SPDX-License-Identifier: BSL-1.0 set(VIRTUOSEVPP_ROOT_DIR "${VIRTUOSEVPP_ROOT_DIR}" diff --git a/cmake/FindWayland.cmake b/cmake/FindWayland.cmake index 80aff5d3a..6885efc86 100644 --- a/cmake/FindWayland.cmake +++ b/cmake/FindWayland.cmake @@ -1,9 +1,12 @@ # - Try to Find Wayland # -# Copyright 2015 Vlad Zagorodniy +# Copyright 2015, Vlad Zagorodniy +# # 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) # +# SPDX-License-Identifier: BSL-1.0 +# # Will be defined: # WAYLAND_FOUND # WAYLAND_CLIENT_FOUND diff --git a/cmake/FindWiiSCAAT.cmake b/cmake/FindWiiSCAAT.cmake index 0b0dd1638..1dc30a97f 100644 --- a/cmake/FindWiiSCAAT.cmake +++ b/cmake/FindWiiSCAAT.cmake @@ -16,14 +16,17 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(WIISCAAT_ROOT_DIR "${WIISCAAT_ROOT_DIR}" diff --git a/cmake/FindWiiUse.cmake b/cmake/FindWiiUse.cmake index 2657cbb60..98fba482e 100644 --- a/cmake/FindWiiUse.cmake +++ b/cmake/FindWiiUse.cmake @@ -15,14 +15,17 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(WIIUSE_ROOT_DIR "${WIIUSE_ROOT_DIR}" diff --git a/cmake/FindWinHID.cmake b/cmake/FindWinHID.cmake index 7dd057214..40855270c 100644 --- a/cmake/FindWinHID.cmake +++ b/cmake/FindWinHID.cmake @@ -18,14 +18,17 @@ # FindWindowsSDK # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(NOT WIN32) find_package_handle_standard_args(WinHID diff --git a/cmake/FindWindowsSDK.cmake b/cmake/FindWindowsSDK.cmake index e2fa6fcff..bb2ae7bc8 100644 --- a/cmake/FindWindowsSDK.cmake +++ b/cmake/FindWindowsSDK.cmake @@ -45,14 +45,17 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2012 Ryan Pavlik -# http://academic.cleardefinition.com +# 2012 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2012. +# Copyright 2012, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(_preferred_sdk_dirs) # pre-output set(_win_sdk_dirs) # pre-output @@ -72,8 +75,21 @@ macro(_winsdk_announce) endif() endmacro() +# See https://developer.microsoft.com/en-us/windows/downloads/sdk-archive - +# although version numbers listed on that page don't necessarily match the directory +# used by the installer. set(_winsdk_win10vers - 10.0.15063.0 # Redstone 2 aka Win10 1703 "Creators' Update" + 10.0.26100.0 + 10.0.22621.0 + 10.0.22000.0 + 10.0.20348.0 + 10.0.19041.0 + 10.0.18362.0 # Win10 1903 "19H1" + 10.0.17763.0 # Win10 1809 "October 2018 Update" + 10.0.17134.0 # Redstone 4 aka Win10 1803 "April 2018 Update" + 10.0.17133.0 # Redstone 4 aka Win10 1803 "April 2018 Update" + 10.0.16299.0 # Redstone 3 aka Win10 1709 "Fall Creators Update" + 10.0.15063.0 # Redstone 2 aka Win10 1703 "Creators Update" 10.0.14393.0 # Redstone aka Win10 1607 "Anniversary Update" 10.0.10586.0 # TH2 aka Win10 1511 10.0.10240.0 # Win10 RTM @@ -613,7 +629,7 @@ if(WINDOWSSDK_FOUND) set(_dirs) foreach(_sdkdir ${ARGN}) get_windowssdk_include_dirs("${_sdkdir}" _current_sdk_incdirs) - if(_current_sdk_libdirs) + if(_current_sdk_incdirs) list(APPEND _dirs ${_current_sdk_incdirs}) endif() endforeach() diff --git a/cmake/FindXrandr.cmake b/cmake/FindXrandr.cmake index 965c42dba..02d672f96 100644 --- a/cmake/FindXrandr.cmake +++ b/cmake/FindXrandr.cmake @@ -16,9 +16,13 @@ # Original Author: # 2014 Kevin M. Godby # +# Copyright 2014, Kevin M. Godby +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(XRANDR_ROOT_DIR "${XRANDR_ROOT_DIR}" diff --git a/cmake/Findargp.cmake b/cmake/Findargp.cmake index 140144d42..cdb89c14f 100644 --- a/cmake/Findargp.cmake +++ b/cmake/Findargp.cmake @@ -16,14 +16,17 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(ARGP_ROOT_DIR "${ARGP_ROOT_DIR}" diff --git a/cmake/Findcppcheck.cmake b/cmake/Findcppcheck.cmake index 3f13a6b3b..a46205856 100644 --- a/cmake/Findcppcheck.cmake +++ b/cmake/Findcppcheck.cmake @@ -20,14 +20,17 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 file(TO_CMAKE_PATH "${CPPCHECK_ROOT_DIR}" CPPCHECK_ROOT_DIR) set(CPPCHECK_ROOT_DIR @@ -64,10 +67,10 @@ set(CMAKE_FIND_APPBUNDLE ${_oldappbundlesetting}) # Find out where our test file is get_filename_component(_cppcheckmoddir ${CMAKE_CURRENT_LIST_FILE} PATH) -set(_cppcheckdummyfile "${_cppcheckmoddir}/Findcppcheck.cpp") -if(NOT EXISTS "${_cppcheckdummyfile}") +set(_cppchecktestfile "${_cppcheckmoddir}/Findcppcheck.cpp") +if(NOT EXISTS "${_cppchecktestfile}") message(FATAL_ERROR - "Missing file ${_cppcheckdummyfile} - should be alongside Findcppcheck.cmake, can be found at https://github.com/rpavlik/cmake-modules") + "Missing file ${_cppchecktestfile} - should be alongside Findcppcheck.cmake, can be found at https://github.com/rpavlik/cmake-modules") endif() function(_cppcheck_test_arg _resultvar _arg) @@ -79,7 +82,7 @@ function(_cppcheck_test_arg _resultvar _arg) "${CPPCHECK_EXECUTABLE}" "${_arg}" "--quiet" - "${_cppcheckdummyfile}" + "${_cppchecktestfile}" RESULT_VARIABLE _cppcheck_result OUTPUT_QUIET diff --git a/cmake/Findcppcheck.cpp b/cmake/Findcppcheck.cpp index 84350db47..167a7a408 100644 --- a/cmake/Findcppcheck.cpp +++ b/cmake/Findcppcheck.cpp @@ -1,13 +1,18 @@ /** * \file Findcppcheck.cpp - * \brief Dummy C++ source file used by CMake module Findcppcheck.cmake + * \brief Test C++ source file used by CMake module Findcppcheck.cmake * * \author - * Ryan Pavlik, 2009-2010 - * - * http://academic.cleardefinition.com/ + * Rylie Pavlik, 2009-2010 + * + * https://ryliepavlik.com/ * */ +// Copyright 2009-2010, Iowa State University +// 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) +// SPDX-License-Identifier: BSL-1.0 diff --git a/cmake/Findcppunit.cmake b/cmake/Findcppunit.cmake index 69150167e..4a8d443cf 100644 --- a/cmake/Findcppunit.cmake +++ b/cmake/Findcppunit.cmake @@ -14,14 +14,17 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2009-2011 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2011 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2011. +# Copyright 2009-2011, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(CPPUNIT_ROOT_DIR "${CPPUNIT_ROOT_DIR}" diff --git a/cmake/Findcutil.cmake b/cmake/Findcutil.cmake index 495f2840a..beca612b6 100644 --- a/cmake/Findcutil.cmake +++ b/cmake/Findcutil.cmake @@ -7,14 +7,17 @@ # install_cutil({RUNTIME_LIBRARY_DESTINATION}) - Install the CUTIL shared lib if created. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 find_package(CUDA QUIET) diff --git a/cmake/Finddb2pdf.cmake b/cmake/Finddb2pdf.cmake index e3ad03a2b..47c7f4fa7 100644 --- a/cmake/Finddb2pdf.cmake +++ b/cmake/Finddb2pdf.cmake @@ -11,14 +11,17 @@ # DB2PDF_ROOT_DIR - A directory prefix to search # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(DB2PDF_ROOT_DIR diff --git a/cmake/FindosgLua.cmake b/cmake/FindosgLua.cmake index d6a682e64..cdda756f5 100644 --- a/cmake/FindosgLua.cmake +++ b/cmake/FindosgLua.cmake @@ -12,14 +12,17 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(OSGLUA_ROOT_DIR "${OSGLUA_ROOT_DIR}" diff --git a/cmake/Findquatlib.cmake b/cmake/Findquatlib.cmake index efca27f70..0d87096b1 100644 --- a/cmake/Findquatlib.cmake +++ b/cmake/Findquatlib.cmake @@ -6,14 +6,17 @@ # QUATLIB_FOUND - True if quatlib found. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(TARGET quat) # Look for the header file. diff --git a/cmake/Findudev.cmake b/cmake/Findudev.cmake index ce454d576..8c2f97f72 100644 --- a/cmake/Findudev.cmake +++ b/cmake/Findudev.cmake @@ -13,8 +13,14 @@ # Requires these CMake modules: # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # -# Original Author: -# 2014 Kevin M. Godby +# Original Authors: +# 2014, Kevin M. Godby +# 2021, Rylie Pavlik +# +# Copyright 2014, Kevin M. Godby +# Copyright 2021, Collabora, Ltd. +# +# SPDX-License-Identifier: BSL-1.0 # # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at @@ -26,9 +32,11 @@ set(UDEV_ROOT_DIR PATH "Directory to search for udev") -find_package(PkgConfig QUIET) -if(PKG_CONFIG_FOUND) - pkg_check_modules(PC_LIBUDEV libudev) +if(NOT ANDROID) + find_package(PkgConfig QUIET) + if(PKG_CONFIG_FOUND) + pkg_check_modules(PC_LIBUDEV QUIET libudev) + endif() endif() find_library(UDEV_LIBRARY @@ -60,7 +68,7 @@ find_path(UDEV_INCLUDE_DIR ) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(UDEV +find_package_handle_standard_args(udev DEFAULT_MSG UDEV_LIBRARY UDEV_INCLUDE_DIR diff --git a/cmake/GenerateCompatibilityVersionFile.cmake b/cmake/GenerateCompatibilityVersionFile.cmake index 7ac28ed5f..fa51894fd 100644 --- a/cmake/GenerateCompatibilityVersionFile.cmake +++ b/cmake/GenerateCompatibilityVersionFile.cmake @@ -11,18 +11,47 @@ # [CXX_ABI]) #============================================================================= -# Copyright 2015 Sensics, Inc. +# Copyright 2015 Sensics, Inc. # Copyright 2012 Alexander Neundorf # # Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. +# see below. # # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause +#============================================================================= +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# * Neither the names of Kitware, Inc., the Insight Software Consortium, +# nor the names of their contributors may be used to endorse or promote +# products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) include(CMakeParseArguments) @@ -80,4 +109,4 @@ function(generate_compatibility_version_file _filename) endif() endforeach() configure_file("${PREV_FILE}" "${_filename}" COPYONLY) -endfunction() \ No newline at end of file +endfunction() diff --git a/cmake/GetCPUDetails.cmake b/cmake/GetCPUDetails.cmake index b29013c99..1ddd8cb52 100644 --- a/cmake/GetCPUDetails.cmake +++ b/cmake/GetCPUDetails.cmake @@ -15,15 +15,18 @@ # no additional modules required # # Original Author: -# 2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) # +# SPDX-License-Identifier: BSL-1.0 +# if(__get_cpu_details) diff --git a/cmake/GetCompilerInfoString.cmake b/cmake/GetCompilerInfoString.cmake index 1ee5b1f5a..1b3b10db8 100644 --- a/cmake/GetCompilerInfoString.cmake +++ b/cmake/GetCompilerInfoString.cmake @@ -15,15 +15,18 @@ # no additional modules required # # Original Author: -# 2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) # +# SPDX-License-Identifier: BSL-1.0 +# # Some functions based on cmake-2.8.0 modules FindBoost.cmake and CTest.cmake #============================================================================= # Copyright 2006-2009 Kitware, Inc. @@ -32,14 +35,16 @@ # Copyright 2007 Mike Jackson # Copyright 2008 Andreas Pakulat # Copyright 2008-2009 Philip Lowman -# Copyright 2010 Iowa State University (Ryan Pavlik ) +# Copyright 2010 Iowa State University (Rylie Pavlik ) # # Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. +# see below. # # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # CMake - Cross Platform Makefile Generator # Copyright 2000-2009 Kitware, Inc., Insight Software Consortium diff --git a/cmake/GetDefineString.cmake b/cmake/GetDefineString.cmake index 832fea8d1..71378020a 100644 --- a/cmake/GetDefineString.cmake +++ b/cmake/GetDefineString.cmake @@ -7,12 +7,15 @@ # [INCLUDE_DIRS ] # [DEFINES] <-Ddefinitions>) # Original Author: -# 2014 Ryan Pavlik +# 2014 Rylie Pavlik +# +# Copyright 2014, Sensics, Inc. # -# Copyright Sensics, Inc. 2014. # 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) +# +# SPDX-License-Identifier: BSL-1.0 get_filename_component(_getdefinestring_moddir "${CMAKE_CURRENT_LIST_FILE}" PATH) @@ -55,4 +58,4 @@ function(get_define_string) endif() endif() set(${_gds_RESULT} ${${_gds_RESULT}_CACHED} PARENT_SCOPE) -endfunction() \ No newline at end of file +endfunction() diff --git a/cmake/GetDefineString.cpp.in b/cmake/GetDefineString.cpp.in index 99cbbbc9d..21e0bcba6 100644 --- a/cmake/GetDefineString.cpp.in +++ b/cmake/GetDefineString.cpp.in @@ -1,3 +1,10 @@ + +// Copyright 2014, Sensics, Inc. +// 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) +// SPDX-License-Identifier: BSL-1.0 + @GET_DEFINE_STRING_INCLUDES@ char const * info = "INFO" ":" "define[" @GET_DEFINE_STRING_NAME@ "]"; @@ -7,4 +14,4 @@ int main(int argc, char * argv[]) { require += info[argc]; (void)argv; return require; -} \ No newline at end of file +} diff --git a/cmake/GetDirectoryList.cmake b/cmake/GetDirectoryList.cmake index 60f2a0136..0b55f30dc 100644 --- a/cmake/GetDirectoryList.cmake +++ b/cmake/GetDirectoryList.cmake @@ -5,14 +5,17 @@ # Requires CMake 2.6 or newer (uses the 'function' command) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(__get_directory_list) return() diff --git a/cmake/GetFileList.cmake b/cmake/GetFileList.cmake index 2e0c3791e..715f11ac7 100644 --- a/cmake/GetFileList.cmake +++ b/cmake/GetFileList.cmake @@ -5,14 +5,17 @@ # Requires CMake 2.6 or newer (uses the 'function' command) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(__get_file_list) return() diff --git a/cmake/GetForceIncludeDefinitions.cmake b/cmake/GetForceIncludeDefinitions.cmake index efcca047b..967778b60 100644 --- a/cmake/GetForceIncludeDefinitions.cmake +++ b/cmake/GetForceIncludeDefinitions.cmake @@ -9,14 +9,17 @@ # a list item to be filtered. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(__get_force_include_definitions) return() diff --git a/cmake/GetGitRevisionDescription.cmake b/cmake/GetGitRevisionDescription.cmake index 8ab03bc5f..9f5419129 100644 --- a/cmake/GetGitRevisionDescription.cmake +++ b/cmake/GetGitRevisionDescription.cmake @@ -3,7 +3,7 @@ # These functions force a re-configure on each git commit so that you can # trust the values of the variables in your build system. # -# get_git_head_revision( [ ...]) +# get_git_head_revision( [ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR]) # # Returns the refspec and sha hash of the current head revision # @@ -12,6 +12,11 @@ # Returns the results of git describe on the source tree, and adjusting # the output so that it tests false if an error occurs. # +# git_describe_working_tree( [ ...]) +# +# Returns the results of git describe on the working tree (--dirty option), +# and adjusting the output so that it tests false if an error occurs. +# # git_get_exact_tag( [ ...]) # # Returns the results of git describe --exact-match on the source tree, @@ -27,17 +32,21 @@ # Requires CMake 2.6 or newer (uses the 'function' command) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com -# Iowa State University HCI Graduate Program/VRAC +# 2009-2020 Rylie Pavlik +# https://ryliepavlik.com/ +# +# Copyright 2009-2013, Iowa State University. +# Copyright 2013-2020, Rylie Pavlik +# Copyright 2013-2020, Contributors +# +# SPDX-License-Identifier: BSL-1.0 # -# 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) if(__get_git_revision_description) - return() + return() endif() set(__get_git_revision_description YES) @@ -45,124 +54,234 @@ set(__get_git_revision_description YES) # to find the path to this module rather than the path to a calling list file get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH) +# Function _git_find_closest_git_dir finds the next closest .git directory +# that is part of any directory in the path defined by _start_dir. +# The result is returned in the parent scope variable whose name is passed +# as variable _git_dir_var. If no .git directory can be found, the +# function returns an empty string via _git_dir_var. +# +# Example: Given a path C:/bla/foo/bar and assuming C:/bla/.git exists and +# neither foo nor bar contain a file/directory .git. This wil return +# C:/bla/.git +# +function(_git_find_closest_git_dir _start_dir _git_dir_var) + set(cur_dir "${_start_dir}") + set(git_dir "${_start_dir}/.git") + while(NOT EXISTS "${git_dir}") + # .git dir not found, search parent directories + set(git_previous_parent "${cur_dir}") + get_filename_component(cur_dir "${cur_dir}" DIRECTORY) + if(cur_dir STREQUAL git_previous_parent) + # We have reached the root directory, we are not in git + set(${_git_dir_var} + "" + PARENT_SCOPE) + return() + endif() + set(git_dir "${cur_dir}/.git") + endwhile() + set(${_git_dir_var} + "${git_dir}" + PARENT_SCOPE) +endfunction() + function(get_git_head_revision _refspecvar _hashvar) - set(GIT_PARENT_DIR "${CMAKE_CURRENT_SOURCE_DIR}") - set(GIT_DIR "${GIT_PARENT_DIR}/.git") - while(NOT EXISTS "${GIT_DIR}") # .git dir not found, search parent directories - set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}") - get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH) - if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT) - # We have reached the root directory, we are not in git - set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE) - set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE) - return() - endif() - set(GIT_DIR "${GIT_PARENT_DIR}/.git") - endwhile() - # check if this is a submodule - if(NOT IS_DIRECTORY ${GIT_DIR}) - file(READ ${GIT_DIR} submodule) - string(REGEX REPLACE "gitdir: (.*)\n$" "\\1" GIT_DIR_RELATIVE ${submodule}) - get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH) - get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE} ABSOLUTE) - endif() - set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data") - if(NOT EXISTS "${GIT_DATA}") - file(MAKE_DIRECTORY "${GIT_DATA}") - endif() - - if(NOT EXISTS "${GIT_DIR}/HEAD") - return() - endif() - set(HEAD_FILE "${GIT_DATA}/HEAD") - configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY) - - configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in" - "${GIT_DATA}/grabRef.cmake" - @ONLY) - include("${GIT_DATA}/grabRef.cmake") - - set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE) - set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE) + _git_find_closest_git_dir("${CMAKE_CURRENT_SOURCE_DIR}" GIT_DIR) + + if("${ARGN}" STREQUAL "ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR") + set(ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR TRUE) + else() + set(ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR FALSE) + endif() + if(NOT "${GIT_DIR}" STREQUAL "") + file(RELATIVE_PATH _relative_to_source_dir "${CMAKE_SOURCE_DIR}" + "${GIT_DIR}") + if("${_relative_to_source_dir}" MATCHES "[.][.]" + AND NOT ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR) + # We've gone above the CMake root dir. + set(GIT_DIR "") + endif() + endif() + if("${GIT_DIR}" STREQUAL "") + set(${_refspecvar} + "GITDIR-NOTFOUND" + PARENT_SCOPE) + set(${_hashvar} + "GITDIR-NOTFOUND" + PARENT_SCOPE) + return() + endif() + + # Check if the current source dir is a git submodule or a worktree. + # In both cases .git is a file instead of a directory. + # + if(NOT IS_DIRECTORY ${GIT_DIR}) + # The following git command will return a non empty string that + # points to the super project working tree if the current + # source dir is inside a git submodule. + # Otherwise the command will return an empty string. + # + execute_process( + COMMAND "${GIT_EXECUTABLE}" rev-parse + --show-superproject-working-tree + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + OUTPUT_VARIABLE out + ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) + if(NOT "${out}" STREQUAL "") + # If out is empty, GIT_DIR/CMAKE_CURRENT_SOURCE_DIR is in a submodule + file(READ ${GIT_DIR} submodule) + string(REGEX REPLACE "gitdir: (.*)$" "\\1" GIT_DIR_RELATIVE + ${submodule}) + string(STRIP ${GIT_DIR_RELATIVE} GIT_DIR_RELATIVE) + get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH) + get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE} + ABSOLUTE) + set(HEAD_SOURCE_FILE "${GIT_DIR}/HEAD") + else() + # GIT_DIR/CMAKE_CURRENT_SOURCE_DIR is in a worktree + file(READ ${GIT_DIR} worktree_ref) + # The .git directory contains a path to the worktree information directory + # inside the parent git repo of the worktree. + # + string(REGEX REPLACE "gitdir: (.*)$" "\\1" git_worktree_dir + ${worktree_ref}) + string(STRIP ${git_worktree_dir} git_worktree_dir) + _git_find_closest_git_dir("${git_worktree_dir}" GIT_DIR) + set(HEAD_SOURCE_FILE "${git_worktree_dir}/HEAD") + endif() + else() + set(HEAD_SOURCE_FILE "${GIT_DIR}/HEAD") + endif() + set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data") + if(NOT EXISTS "${GIT_DATA}") + file(MAKE_DIRECTORY "${GIT_DATA}") + endif() + + if(NOT EXISTS "${HEAD_SOURCE_FILE}") + return() + endif() + set(HEAD_FILE "${GIT_DATA}/HEAD") + configure_file("${HEAD_SOURCE_FILE}" "${HEAD_FILE}" COPYONLY) + + configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in" + "${GIT_DATA}/grabRef.cmake" @ONLY) + include("${GIT_DATA}/grabRef.cmake") + + set(${_refspecvar} + "${HEAD_REF}" + PARENT_SCOPE) + set(${_hashvar} + "${HEAD_HASH}" + PARENT_SCOPE) endfunction() function(git_describe _var) - if(NOT GIT_FOUND) - find_package(Git QUIET) - endif() - get_git_head_revision(refspec hash) - if(NOT GIT_FOUND) - set(${_var} "GIT-NOTFOUND" PARENT_SCOPE) - return() - endif() - if(NOT hash) - set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE) - return() - endif() - - # TODO sanitize - #if((${ARGN}" MATCHES "&&") OR - # (ARGN MATCHES "||") OR - # (ARGN MATCHES "\\;")) - # message("Please report the following error to the project!") - # message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}") - #endif() - - #message(STATUS "Arguments to execute_process: ${ARGN}") - - execute_process(COMMAND - "${GIT_EXECUTABLE}" - describe - ${hash} - ${ARGN} - WORKING_DIRECTORY - "${CMAKE_CURRENT_SOURCE_DIR}" - RESULT_VARIABLE - res - OUTPUT_VARIABLE - out - ERROR_QUIET - OUTPUT_STRIP_TRAILING_WHITESPACE) - if(NOT res EQUAL 0) - set(out "${out}-${res}-NOTFOUND") - endif() - - set(${_var} "${out}" PARENT_SCOPE) + if(NOT GIT_FOUND) + find_package(Git QUIET) + endif() + get_git_head_revision(refspec hash) + if(NOT GIT_FOUND) + set(${_var} + "GIT-NOTFOUND" + PARENT_SCOPE) + return() + endif() + if(NOT hash) + set(${_var} + "HEAD-HASH-NOTFOUND" + PARENT_SCOPE) + return() + endif() + + # TODO sanitize + #if((${ARGN}" MATCHES "&&") OR + # (ARGN MATCHES "||") OR + # (ARGN MATCHES "\\;")) + # message("Please report the following error to the project!") + # message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}") + #endif() + + #message(STATUS "Arguments to execute_process: ${ARGN}") + + execute_process( + COMMAND "${GIT_EXECUTABLE}" describe --tags --always ${hash} ${ARGN} + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + RESULT_VARIABLE res + OUTPUT_VARIABLE out + ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) + if(NOT res EQUAL 0) + set(out "${out}-${res}-NOTFOUND") + endif() + + set(${_var} + "${out}" + PARENT_SCOPE) +endfunction() + +function(git_describe_working_tree _var) + if(NOT GIT_FOUND) + find_package(Git QUIET) + endif() + if(NOT GIT_FOUND) + set(${_var} + "GIT-NOTFOUND" + PARENT_SCOPE) + return() + endif() + + execute_process( + COMMAND "${GIT_EXECUTABLE}" describe --dirty ${ARGN} + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + RESULT_VARIABLE res + OUTPUT_VARIABLE out + ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) + if(NOT res EQUAL 0) + set(out "${out}-${res}-NOTFOUND") + endif() + + set(${_var} + "${out}" + PARENT_SCOPE) endfunction() function(git_get_exact_tag _var) - git_describe(out --exact-match ${ARGN}) - set(${_var} "${out}" PARENT_SCOPE) + git_describe(out --exact-match ${ARGN}) + set(${_var} + "${out}" + PARENT_SCOPE) endfunction() function(git_local_changes _var) - if(NOT GIT_FOUND) - find_package(Git QUIET) - endif() - get_git_head_revision(refspec hash) - if(NOT GIT_FOUND) - set(${_var} "GIT-NOTFOUND" PARENT_SCOPE) - return() - endif() - if(NOT hash) - set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE) - return() - endif() - - execute_process(COMMAND - "${GIT_EXECUTABLE}" - diff-index --quiet HEAD -- - WORKING_DIRECTORY - "${CMAKE_CURRENT_SOURCE_DIR}" - RESULT_VARIABLE - res - OUTPUT_VARIABLE - out - ERROR_QUIET - OUTPUT_STRIP_TRAILING_WHITESPACE) - if(res EQUAL 0) - set(${_var} "CLEAN" PARENT_SCOPE) - else() - set(${_var} "DIRTY" PARENT_SCOPE) - endif() + if(NOT GIT_FOUND) + find_package(Git QUIET) + endif() + get_git_head_revision(refspec hash) + if(NOT GIT_FOUND) + set(${_var} + "GIT-NOTFOUND" + PARENT_SCOPE) + return() + endif() + if(NOT hash) + set(${_var} + "HEAD-HASH-NOTFOUND" + PARENT_SCOPE) + return() + endif() + + execute_process( + COMMAND "${GIT_EXECUTABLE}" diff-index --quiet HEAD -- + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + RESULT_VARIABLE res + OUTPUT_VARIABLE out + ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) + if(res EQUAL 0) + set(${_var} + "CLEAN" + PARENT_SCOPE) + else() + set(${_var} + "DIRTY" + PARENT_SCOPE) + endif() endfunction() diff --git a/cmake/GetGitRevisionDescription.cmake.in b/cmake/GetGitRevisionDescription.cmake.in index 6d8b708ef..9b8d20763 100644 --- a/cmake/GetGitRevisionDescription.cmake.in +++ b/cmake/GetGitRevisionDescription.cmake.in @@ -4,14 +4,18 @@ # Requires CMake 2.6 or newer (uses the 'function' command) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2023 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2012, Iowa State University +# Copyright 2011-2023, Contributors +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(HEAD_HASH) @@ -19,23 +23,26 @@ file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024) string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS) if(HEAD_CONTENTS MATCHES "ref") - # named branch - string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}") - if(EXISTS "@GIT_DIR@/${HEAD_REF}") - configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY) - else() - configure_file("@GIT_DIR@/packed-refs" "@GIT_DATA@/packed-refs" COPYONLY) - file(READ "@GIT_DATA@/packed-refs" PACKED_REFS) - if(${PACKED_REFS} MATCHES "([0-9a-z]*) ${HEAD_REF}") - set(HEAD_HASH "${CMAKE_MATCH_1}") - endif() - endif() + # named branch + string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}") + if(EXISTS "@GIT_DIR@/${HEAD_REF}") + configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY) + else() + if(EXISTS "@GIT_DIR@/packed-refs") + configure_file("@GIT_DIR@/packed-refs" "@GIT_DATA@/packed-refs" + COPYONLY) + file(READ "@GIT_DATA@/packed-refs" PACKED_REFS) + if(${PACKED_REFS} MATCHES "([0-9a-z]*) ${HEAD_REF}") + set(HEAD_HASH "${CMAKE_MATCH_1}") + endif() + endif() + endif() else() - # detached HEAD - configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY) + # detached HEAD + configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY) endif() if(NOT HEAD_HASH) - file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024) - string(STRIP "${HEAD_HASH}" HEAD_HASH) + file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024) + string(STRIP "${HEAD_HASH}" HEAD_HASH) endif() diff --git a/cmake/GetMSVCVersion.cmake b/cmake/GetMSVCVersion.cmake index 48d7b7c17..19c5cb09a 100644 --- a/cmake/GetMSVCVersion.cmake +++ b/cmake/GetMSVCVersion.cmake @@ -30,7 +30,7 @@ # The variable is not modified if not building with MSVC. #============================================================================= -# Copyright 2015 Ryan Pavlik +# Copyright 2015 Rylie Pavlik # # Distributed under the OSI-approved BSD License (the "License"); # see below. @@ -38,6 +38,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without @@ -102,7 +104,7 @@ function(get_msvc_major_version _var) if(NOT MSVC) return() endif() - get_msvc_major_minor_version(_vs_ver _dummy) + get_msvc_major_minor_version(_vs_ver _unused) set(${_var} ${_vs_ver} PARENT_SCOPE) endfunction() @@ -110,7 +112,7 @@ function(get_msvc_minor_version _var) if(NOT MSVC) return() endif() - get_msvc_major_minor_version(_dummy _vs_ver) + get_msvc_major_minor_version(_unused _vs_ver) set(${_var} ${_vs_ver} PARENT_SCOPE) endfunction() diff --git a/cmake/GetSearchDirs.cmake b/cmake/GetSearchDirs.cmake deleted file mode 100644 index 6c0111d9e..000000000 --- a/cmake/GetSearchDirs.cmake +++ /dev/null @@ -1,38 +0,0 @@ - -# Call with the output var, then with one or more dependencies (imported targets) -# It will APPEND directories to look in to your output var. -function(get_search_dirs _var) - set(properties_to_check LOCATION) - set(configs ${CMAKE_CONFIGURATION_TYPES}) - if(CMAKE_BUILD_TYPE) - # NOCONFIG is the name used in exported target files when CMAKE_BUILD_TYPE - # is left blank. - list(APPEND configs ${CMAKE_BUILD_TYPE} NOCONFIG) - endif() - - if(configs) - foreach(config ${configs}) - string(TOUPPER ${config} config_uc) - list(APPEND properties_to_check LOCATION_${config_uc}) - endforeach() - endif() - - set(searchdirs ${${_var}}) - foreach(dep ${ARGN}) - if(TARGET ${dep}) - foreach(prop ${properties_to_check}) - get_property(loc_set TARGET ${dep} PROPERTY ${prop} SET) - if(loc_set) - get_property(loc TARGET ${dep} PROPERTY ${prop}) - get_filename_component(dir "${loc}" DIRECTORY) - list(APPEND searchdirs "${dir}") - endif() - endforeach() - endif() - endforeach() - - if(searchdirs) - list(REMOVE_DUPLICATES searchdirs) - endif() - set(${_var} ${searchdirs} PARENT_SCOPE) -endfunction() diff --git a/cmake/GetSubprojectStatus.cmake b/cmake/GetSubprojectStatus.cmake index 888a2caec..c9844e070 100644 --- a/cmake/GetSubprojectStatus.cmake +++ b/cmake/GetSubprojectStatus.cmake @@ -6,14 +6,17 @@ # Requires CMake 2.6 or newer (uses the 'function' command) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(__get_subproject_status) return() diff --git a/cmake/InstallDebugSymbols.cmake b/cmake/InstallDebugSymbols.cmake index c708daa94..7210fec1e 100644 --- a/cmake/InstallDebugSymbols.cmake +++ b/cmake/InstallDebugSymbols.cmake @@ -19,13 +19,16 @@ # necessitating this function in the first place). # # Original Author: -# 2015, 2017 Ryan Pavlik -# http://ryanpavlik.com +# 2015, 2017 Rylie Pavlik +# https://ryliepavlik.com/ +# +# Copyright 2015, 2017, Sensics, Inc. # -# Copyright Sensics, Inc. 2015, 2017. # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(MSVC AND NOT CMAKE_VERSION VERSION_LESS 3.2) include(CMakeParseArguments) diff --git a/cmake/Licensing.cmake b/cmake/Licensing.cmake deleted file mode 100644 index dae8e8b5a..000000000 --- a/cmake/Licensing.cmake +++ /dev/null @@ -1,133 +0,0 @@ -# - Building a licensing description file -# -# Original Author: -# 2009-2010 Ryan Pavlik -# 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) - -define_property(GLOBAL - PROPERTY - PROPRIETARY_LICENSES - BRIEF_DOCS - "Text for proprietary licenses" - FULL_DOCS - "Text for proprietary licenses") -define_property(GLOBAL - PROPERTY - SHAREALIKE_LICENSES - BRIEF_DOCS - "Text for share-alike licenses" - FULL_DOCS - "Text for share-alike licenses (e.g. GPL)") -define_property(GLOBAL - PROPERTY - PERMISSIVE_LICENSES - BRIEF_DOCS - "Text for permissive licenses" - FULL_DOCS - "Text for permissive licenses (e.g. BSD, MIT, X11)") -define_property(GLOBAL - PROPERTY - PACKAGES_LICENSED - BRIEF_DOCS - "List of all packages whose licenses are registered here" - FULL_DOCS - "List of all packages whose licenses are registered here") -define_property(GLOBAL - PROPERTY - REDISTRIBUTION_WARNINGS - BRIEF_DOCS - "Text for important redistribution warnings" - FULL_DOCS - "Text for important redistribution warnings, such as 'This is not redistributable!'") - - -function(add_license LICENSE_TYPE_PROPERTY package license) - get_property(def GLOBAL PROPERTY LICENSE_PACKAGE_${package} DEFINED) - if(NOT def) - define_property(GLOBAL - PROPERTY - LICENSE_PACKAGE_${package} - BRIEF_DOCS - "Flag to indicate the addition of the license for ${package}" - FULL_DOCS - "Flag to indicate the addition of the license for ${package}") - get_property(existing GLOBAL PROPERTY ${LICENSE_TYPE_PROPERTY}) - set_property(GLOBAL - PROPERTY - ${LICENSE_TYPE_PROPERTY} - "${existing}${license}\n\n") - - if(ARGN) - define_property(GLOBAL - PROPERTY - LICENSE_EXTRAS_PACKAGE_${package} - BRIEF_DOCS - "Extras (like URL) for the license for ${package}" - FULL_DOCS - "Extras (like URL) for the license for ${package}") - set_property(GLOBAL - PROPERTY - LICENSE_EXTRAS_PACKAGE_${package} - "${ARGN}") - endif() - - get_property(allpackages GLOBAL PROPERTY PACKAGES_LICENSED) - list(APPEND allpackages "${package}") - set_property(GLOBAL PROPERTY PACKAGES_LICENSED "${allpackages}") - endif() -endfunction() - -function(add_proprietary_license package license) - add_license(PROPRIETARY_LICENSES "${package}" "${license}" ${ARGN}) -endfunction() - -function(add_sharealike_license package license) - add_license(SHAREALIKE_LICENSES "${package}" "${license}" ${ARGN}) -endfunction() - -function(add_permissive_license package license) - add_license(PERMISSIVE_LICENSES "${package}" "${license}" ${ARGN}) -endfunction() - -function(add_redistribution_warning warning) - get_property(existing GLOBAL PROPERTY REDISTRIBUTION_WARNINGS) - set_property(GLOBAL - PROPERTY - REDISTRIBUTION_WARNINGS - "${warning} ${existing}") -endfunction() - -function(configure_license_file input output) - get_property(PACKAGES_LICENSED GLOBAL PROPERTY PACKAGES_LICENSED) - if(PACKAGES_LICENSED) - list(SORT PACKAGES_LICENSED) - set(PACKAGES_LICENSED_BULLETED) - foreach(package ${PACKAGES_LICENSED}) - set(EXTRAS) - get_property(package_extras - GLOBAL - PROPERTY - "LICENSE_EXTRAS_PACKAGE_${package}") - if(package_extras) - set(EXTRAS " ${package_extras}") - endif() - set(PACKAGES_LICENSED_BULLETED - "${PACKAGES_LICENSED_BULLETED} * ${package}${EXTRAS}\n") - endforeach() - endif() - get_property(REDISTRIBUTION_WARNINGS - GLOBAL - PROPERTY - REDISTRIBUTION_WARNINGS) - get_property(PROPRIETARY_LICENSES GLOBAL PROPERTY PROPRIETARY_LICENSES) - get_property(SHAREALIKE_LICENSES GLOBAL PROPERTY SHAREALIKE_LICENSES) - get_property(PERMISSIVE_LICENSES GLOBAL PROPERTY PERMISSIVE_LICENSES) - configure_file("${input}" "${output}" ${ARGN}) -endfunction() - diff --git a/cmake/ListCombinations.cmake b/cmake/ListCombinations.cmake index 4321f624a..406bf599f 100644 --- a/cmake/ListCombinations.cmake +++ b/cmake/ListCombinations.cmake @@ -6,14 +6,17 @@ # list of prefixes or suffixes respectively. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(__list_combinations) return() diff --git a/cmake/ListFilter.cmake b/cmake/ListFilter.cmake index 037859520..b42f43237 100644 --- a/cmake/ListFilter.cmake +++ b/cmake/ListFilter.cmake @@ -11,14 +11,17 @@ # a list item to be filtered. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(__list_filter_out) return() diff --git a/cmake/LuaTargets.cmake b/cmake/LuaTargets.cmake index 040f6b44a..c0e8c7d9a 100644 --- a/cmake/LuaTargets.cmake +++ b/cmake/LuaTargets.cmake @@ -13,14 +13,17 @@ # Requires CMake 2.6 or newer (uses the 'function' command) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(__add_lua) return() diff --git a/cmake/MSVCMultipleProcessCompile.cmake b/cmake/MSVCMultipleProcessCompile.cmake index aad4eabde..4f71748cb 100644 --- a/cmake/MSVCMultipleProcessCompile.cmake +++ b/cmake/MSVCMultipleProcessCompile.cmake @@ -6,14 +6,17 @@ # ListCombinations.cmake # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(MSVC AND NOT "${MSVC_VERSION}" LESS 1400) # Only available in VS 2005 and newer diff --git a/cmake/MSVCStaticRuntime.cmake b/cmake/MSVCStaticRuntime.cmake index e4ceea6f9..e3c465573 100644 --- a/cmake/MSVCStaticRuntime.cmake +++ b/cmake/MSVCStaticRuntime.cmake @@ -6,14 +6,17 @@ # ListCombinations.cmake # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(MSVC) string(TOUPPER "${CMAKE_CONFIGURATION_TYPES}" _conftypesUC) diff --git a/cmake/MSVCVerboseLinking.cmake b/cmake/MSVCVerboseLinking.cmake index 84d4a2278..4db0362dd 100644 --- a/cmake/MSVCVerboseLinking.cmake +++ b/cmake/MSVCVerboseLinking.cmake @@ -9,14 +9,17 @@ # - none # # Original Author: -# 2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(MSVC) if(NOT DEFINED MSVC_LINK_REALLY_VERBOSE) diff --git a/cmake/MapImportedReleaseVariants.cmake b/cmake/MapImportedReleaseVariants.cmake index cd4ce93fc..4ed9bf797 100644 --- a/cmake/MapImportedReleaseVariants.cmake +++ b/cmake/MapImportedReleaseVariants.cmake @@ -3,13 +3,16 @@ # kind of "Release" variant, things will just work. # # Original Author: -# 2015 Ryan Pavlik -# http://academic.cleardefinition.com +# 2015 Rylie Pavlik +# https://ryliepavlik.com/ +# +# Copyright 2015, Sensics, Inc. # -# Copyright Sensics, Inc. 2015. # 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) +# +# SPDX-License-Identifier: BSL-1.0 # RelWithDebInfo falls back to Release, then MinSizeRel set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO RelWithDebInfo Release MinSizeRel NoConfig) diff --git a/cmake/MinGWSearchPathExtras.cmake b/cmake/MinGWSearchPathExtras.cmake index cd9fe69bb..782757e7e 100644 --- a/cmake/MinGWSearchPathExtras.cmake +++ b/cmake/MinGWSearchPathExtras.cmake @@ -10,12 +10,15 @@ # MINGWSEARCH_TARGET_TRIPLE - something like x86_64-w64-mingw32 or i686-w64-mingw32, use as you see fit. # # Original Author: -# 2016 Ryan Pavlik +# 2016 Rylie Pavlik +# +# Copyright 2016, Sensics, Inc. # -# Copyright Sensics, Inc. 2016. # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(MINGW AND NOT MINGWSEARCH_COMPLETED) ### diff --git a/cmake/OptionRequires.cmake b/cmake/OptionRequires.cmake index 662121f57..b1d2a8c91 100644 --- a/cmake/OptionRequires.cmake +++ b/cmake/OptionRequires.cmake @@ -3,14 +3,17 @@ # option_requires( [...]) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 function(option_requires name desc) set(args ${ARGN}) diff --git a/cmake/PlatformDefinitions.cmake b/cmake/PlatformDefinitions.cmake index 17f71e6b0..5e4889509 100644 --- a/cmake/PlatformDefinitions.cmake +++ b/cmake/PlatformDefinitions.cmake @@ -8,10 +8,14 @@ # Author: # Kevin M. Godby # +# Copyright 2015, Kevin M. Godby +# # 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) # +# SPDX-License-Identifier: BSL-1.0 +# function(_define_platform_macros_impl prefix platform_string variable_name) if (${CMAKE_SYSTEM_NAME} MATCHES "${platform_string}") diff --git a/cmake/PrefixListGlob.cmake b/cmake/PrefixListGlob.cmake index 3b1bb6460..9837ec284 100644 --- a/cmake/PrefixListGlob.cmake +++ b/cmake/PrefixListGlob.cmake @@ -2,14 +2,17 @@ # # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(__prefix_list_glob) return() diff --git a/cmake/ProgramFilesGlob.cmake b/cmake/ProgramFilesGlob.cmake index 9d7a9cc50..4870c61f2 100644 --- a/cmake/ProgramFilesGlob.cmake +++ b/cmake/ProgramFilesGlob.cmake @@ -5,14 +5,17 @@ # PrefixListGlob # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 include(PrefixListGlob) include(CleanDirectoryList) diff --git a/cmake/README.markdown b/cmake/README.markdown index 81ec9b22d..99b1dd930 100644 --- a/cmake/README.markdown +++ b/cmake/README.markdown @@ -1,32 +1,47 @@ -Ryan's CMake Modules -==================== +# Rylie's CMake Modules Collection -Ryan A. Pavlik, Ph.D. +Rylie Pavlik, Ph.D. - - + -Introduction ------------- + + + + +## Introduction This is a collection of CMake modules that I've produced during the course of a variety of software development. There are a number of find modules, especially for virtual reality and physical simulation packages, some utility modules of more general interest, and some patches or workarounds for -CMake itself. +(very old versions of) CMake itself. Each module is generally documented, and depending on how busy I was when I created it, the documentation can be fairly complete. By now, it also includes contributions both from open-source projects I work on, as well as friendly strangers on the Internet contributing their modules. I am -very grateful for improvements/fixes/pull requests! +very grateful for improvements/fixes/pull requests! As usual, contributions to +files are assumed to be under the same license as they were offered to you +(incoming == outgoing), and any new files must have proper copyright and SPDX +license identifer headers. -How to Integrate ----------------- +## How to Integrate -These modules are probably best placed wholesale into a `cmake` subdirectory -of your project source. +How would you like to use these? Some of the modules, particularly older ones, +have a number of internal dependencies, and thus would be best placed wholesale +into a `cmake` subdirectory of your project source. Otherwise, you may consider +just picking the subset you prefer into such a `cmake` subdirectory. + +### All Modules If you use Git, try installing [git-subtree][1] (included by default on Git for Windows and perhaps for your Linux distro, especially post-1.9.1), so @@ -34,74 +49,101 @@ you can easily use this repository for subtree merges, updating simply. For the initial checkout: - cd projectdir +```sh +cd yourprojectdir - git subtree add --squash --prefix=cmake https://github.com/rpavlik/cmake-modules.git master +git subtree add --squash --prefix=cmake https://github.com/rpavlik/cmake-modules.git main +``` For updates: - cd projectdir +```sh +cd yourprojectdir - git subtree pull --squash --prefix=cmake https://github.com/rpavlik/cmake-modules.git master +git subtree pull --squash --prefix=cmake https://github.com/rpavlik/cmake-modules.git main +``` -If you originally installed this by just copying the files, you'll sadly have -to delete the directory, commit that, then do the `git subtree add`. Annoying, -but I don't know a workaround. +If you originally installed this by just copying the files, you'll sadly have to +delete the directory, commit that, then do the `git subtree add`. Annoying, but +I don't know a workaround. (Alternately you can use the method described below, +for the "subset of modules", to update.) If you use some other version control, you can export a copy of this directory without the git metadata by calling: - ./export-to-directory.sh yourprojectdir/cmake +```sh +./export-to-directory.sh ../yourprojectdir/cmake +``` You might also consider exporting to a temp directory and merging changes, since this will not overwrite by default. You can pass -f to overwrite existing files. -How to Use ----------- +### Just a few modules + +Many newer modules don't have any or many internal dependencies. You can review +them to look for any `include(` statements or other things that increase the +files used (e.g. `configure_file(`, `file(READ`, `file(GENERATE`), and make sure +you copy those too. + +If this is how you originally started using these modules, then running the +following from within a clone of this repo will automatically update any files. +**Be sure you have committed any local changes in your project first to avoid +potentially losing work!** + +```sh +./update-modules.sh ../yourprojectdir/cmake/ +``` + +Note that the script is not smart enough to know about changed dependent +scripts/files, nor about scripts with matching names but not originating in this +project (it just looks at file names/paths), so manually review the diff before +committing in your project. + +## How to Use At the minimum, all you have to do is add a line like this near the top of your root CMakeLists.txt file (but not before your `project()` call): - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") +```cmake +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") +``` You might also want the extra automatic features/fixes included with the modules, for that, just add another line following the first one: - include(UseBackportedModules) +```cmake +include(UseBackportedModules) +``` -Look at `module-help.html`/`.txt` (generated by `update-help.sh` on a unix-like shell with a pre-3.0 version of CMake.) -either in this directory or online at -for more information on individual modules. Since it requires an older CMake for generation, -the docs might get out of date, sorry - but you can always look at the files themselves. +For more information on individual modules, look at the files themselves: they +should all start with a comment. - -Licenses --------- +## Licenses The modules that I wrote myself are all subject to this license: -> Copyright Iowa State University 2009-2014, -> or Copyright Sensics, Inc. 2014-2015, -> or Copyright Ryan A. Pavlik 2009-2015 +> Copyright 2009-2014, Iowa State University. +> or Copyright 2014-2017, Sensics, Inc., +> or Copyright 2018-2023, Collabora, Ltd., +> or Copyright 2009-2023, Rylie Pavlik > > Distributed under the Boost Software License, Version 1.0. > > (See accompanying file `LICENSE_1_0.txt` or copy at > ) -Modules based on those included with CMake are under the OSI-approved -BSD license, which is included in each of those modules. A few other modules -are modified from other sources - when in doubt, look at the `.cmake`. +Modules based on those included with CMake are under the OSI-approved BSD +license, which is included in each of those modules. A few other modules are +modified from other sources - when in doubt, look at the `.cmake` file - each +file has correct licensing information. If you'd like to contribute, that would be great! Just make sure to include the license boilerplate in your module, and send a pull request. -Important License Note! ------------------------ +## Important License Note If you find this file inside of another project, rather at the top-level directory, you're in a separate project that is making use of these modules. That separate project can (and probably does) have its own license specifics. - -[1]: http://github.com/apenwarr/git-subtree "Git Subtree master" +[1]: https://github.com/git/git/tree/main/contrib/subtree "Git Subtree upstream" diff --git a/cmake/ResetConfigurations.cmake b/cmake/ResetConfigurations.cmake index 8c13fdf66..3e6f8f34e 100644 --- a/cmake/ResetConfigurations.cmake +++ b/cmake/ResetConfigurations.cmake @@ -4,15 +4,17 @@ # no additional modules required # # Original Author: -# 2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) # +# SPDX-License-Identifier: BSL-1.0 if(__reset_configurations) diff --git a/cmake/SearchProgramFilesForOpenSceneGraph.cmake b/cmake/SearchProgramFilesForOpenSceneGraph.cmake index aa7165ef5..560d7d46b 100644 --- a/cmake/SearchProgramFilesForOpenSceneGraph.cmake +++ b/cmake/SearchProgramFilesForOpenSceneGraph.cmake @@ -10,14 +10,17 @@ # ProgramFilesGlob # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 include(ListFilter) include(ProgramFilesGlob) diff --git a/cmake/SetDefaultBuildType.cmake b/cmake/SetDefaultBuildType.cmake index cd29e32ac..f518fd1a0 100644 --- a/cmake/SetDefaultBuildType.cmake +++ b/cmake/SetDefaultBuildType.cmake @@ -4,15 +4,18 @@ # no additional modules required # # Original Author: -# 2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) # +# SPDX-License-Identifier: BSL-1.0 +# if(__set_default_build_type) diff --git a/cmake/SplitLibraryList.cmake b/cmake/SplitLibraryList.cmake index c6e1a3442..a89fd99b8 100644 --- a/cmake/SplitLibraryList.cmake +++ b/cmake/SplitLibraryList.cmake @@ -5,14 +5,17 @@ # Requires CMake 2.6 or newer (uses the 'function' command) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 function(split_library_list _generalvar _releasevar _debugvar) diff --git a/cmake/StampSourcesWithVersion.cmake b/cmake/StampSourcesWithVersion.cmake index 147fed8fc..0b04d4946 100644 --- a/cmake/StampSourcesWithVersion.cmake +++ b/cmake/StampSourcesWithVersion.cmake @@ -35,14 +35,17 @@ # Use for files not directly associated with a target. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(__stamp_sources_with_version) return() diff --git a/cmake/StampSourcesWithVersion.sed.in b/cmake/StampSourcesWithVersion.sed.in index 6fddf90b4..eefbf6a21 100644 --- a/cmake/StampSourcesWithVersion.sed.in +++ b/cmake/StampSourcesWithVersion.sed.in @@ -1,3 +1,11 @@ +# Copyright 2009-2010, Iowa State University +# +# 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) +# +# SPDX-License-Identifier: BSL-1.0 + # Line by line summary: # Until we find the first */ or // { # In sections between /* and */ (that is, a block comment) { @@ -10,4 +18,4 @@ /\/\*/,/\*\// { s_([@\\])version(\s*).*$_\1version\2@version@_1g } -} \ No newline at end of file +} diff --git a/cmake/StashMapConfig.cmake b/cmake/StashMapConfig.cmake index d052028ee..b111506d1 100644 --- a/cmake/StashMapConfig.cmake +++ b/cmake/StashMapConfig.cmake @@ -15,13 +15,16 @@ # defaults based on the platform. # # Original Author: -# 2015, 2017 Ryan Pavlik -# http://ryanpavlik.com +# 2015, 2017 Rylie Pavlik +# https://ryliepavlik.com/ +# +# Copyright 2015, 2017, Sensics, Inc. # -# Copyright Sensics, Inc. 2015, 2017. # 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) +# +# SPDX-License-Identifier: BSL-1.0 macro(stash_map_config config) string(TOUPPER "${config}" smc_config) diff --git a/cmake/TCHARWorkaround.cmake b/cmake/TCHARWorkaround.cmake index 3edcd6a76..6bdad3443 100644 --- a/cmake/TCHARWorkaround.cmake +++ b/cmake/TCHARWorkaround.cmake @@ -5,14 +5,17 @@ # TCHAR_INCLUDE_DIR, location of our fake tchar.h file # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(NOT WIN32) option(TCHAR_WORKAROUND "Work around missing tchar error" on) diff --git a/cmake/UseBackportedModules.cmake b/cmake/UseBackportedModules.cmake index 7ad3baac3..813ff98c4 100644 --- a/cmake/UseBackportedModules.cmake +++ b/cmake/UseBackportedModules.cmake @@ -14,14 +14,17 @@ # CleanDirectoryList # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(NOT CMAKE_VERSION) # defined in >=2.6.3 set(_cmver diff --git a/cmake/UseFolders.cmake b/cmake/UseFolders.cmake index 4fd5dfb17..27fd36fdf 100644 --- a/cmake/UseFolders.cmake +++ b/cmake/UseFolders.cmake @@ -8,13 +8,16 @@ # cannot be used in some older MSVC Express Editions, so it's explicit opt-in there. # # Original Author: -# 2015 Ryan Pavlik -# http://academic.cleardefinition.com +# 2015 Rylie Pavlik +# https://ryliepavlik.com/ +# +# Copyright 2015, Sensics, Inc. # -# Copyright Sensics, Inc. 2015. # 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) +# +# SPDX-License-Identifier: BSL-1.0 function(use_folders) set(_option_name BUILD_WITH_PROJECT_FOLDERS) @@ -31,4 +34,4 @@ function(use_folders) endif() set_property(GLOBAL PROPERTY USE_FOLDERS ${${_option_name}}) -endfunction() \ No newline at end of file +endfunction() diff --git a/cmake/UseMarkdown.cmake b/cmake/UseMarkdown.cmake index 3853167ea..79f37dfff 100644 --- a/cmake/UseMarkdown.cmake +++ b/cmake/UseMarkdown.cmake @@ -13,14 +13,17 @@ # Requires CMake 2.6 or newer (uses the 'function' command) # # Original Author: -# 2011 Ryan Pavlik -# http://academic.cleardefinition.com +# 2011 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2011-2012. +# Copyright 2011-2012, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(__add_markdown_target) return() diff --git a/cmake/UseTR1.cmake b/cmake/UseTR1.cmake index c7f020a66..abb845d9c 100644 --- a/cmake/UseTR1.cmake +++ b/cmake/UseTR1.cmake @@ -4,14 +4,17 @@ # permit TR1 support. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 if(__use_tr1) return() diff --git a/cmake/WarningDev.cmake b/cmake/WarningDev.cmake index 851b5f5e8..7114d2d47 100644 --- a/cmake/WarningDev.cmake +++ b/cmake/WarningDev.cmake @@ -3,14 +3,17 @@ # warning_dev("your desired message") # # Original Author: -# 2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 function(warning_dev _yourmsg) if("1.${CMAKE_VERSION}" VERSION_LESS "1.2.8.0") diff --git a/cmake/cmake-2.8.0-modules/features/SelectLibraryConfigurations.cmake b/cmake/cmake-2.8.0-modules/features/SelectLibraryConfigurations.cmake index ee1220ccd..9ff3fa8a8 100644 --- a/cmake/cmake-2.8.0-modules/features/SelectLibraryConfigurations.cmake +++ b/cmake/cmake-2.8.0-modules/features/SelectLibraryConfigurations.cmake @@ -25,6 +25,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-2.8.0-modules/osg/FindOpenSceneGraph.cmake b/cmake/cmake-2.8.0-modules/osg/FindOpenSceneGraph.cmake index a86d8edb1..35a910593 100644 --- a/cmake/cmake-2.8.0-modules/osg/FindOpenSceneGraph.cmake +++ b/cmake/cmake-2.8.0-modules/osg/FindOpenSceneGraph.cmake @@ -57,6 +57,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-2.8.0-modules/osg/FindOpenThreads.cmake b/cmake/cmake-2.8.0-modules/osg/FindOpenThreads.cmake index b94688921..49775ebe7 100644 --- a/cmake/cmake-2.8.0-modules/osg/FindOpenThreads.cmake +++ b/cmake/cmake-2.8.0-modules/osg/FindOpenThreads.cmake @@ -26,6 +26,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-2.8.0-modules/osg/Findosg.cmake b/cmake/cmake-2.8.0-modules/osg/Findosg.cmake index b9591a21f..88c1198e0 100644 --- a/cmake/cmake-2.8.0-modules/osg/Findosg.cmake +++ b/cmake/cmake-2.8.0-modules/osg/Findosg.cmake @@ -38,6 +38,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-2.8.0-modules/osg/FindosgAnimation.cmake b/cmake/cmake-2.8.0-modules/osg/FindosgAnimation.cmake index 57bd5d805..fe6c270c8 100644 --- a/cmake/cmake-2.8.0-modules/osg/FindosgAnimation.cmake +++ b/cmake/cmake-2.8.0-modules/osg/FindosgAnimation.cmake @@ -34,6 +34,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-2.8.0-modules/osg/FindosgDB.cmake b/cmake/cmake-2.8.0-modules/osg/FindosgDB.cmake index 990089670..6ffb774c7 100644 --- a/cmake/cmake-2.8.0-modules/osg/FindosgDB.cmake +++ b/cmake/cmake-2.8.0-modules/osg/FindosgDB.cmake @@ -34,6 +34,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-2.8.0-modules/osg/FindosgFX.cmake b/cmake/cmake-2.8.0-modules/osg/FindosgFX.cmake index 8fb222549..b42cd7e72 100644 --- a/cmake/cmake-2.8.0-modules/osg/FindosgFX.cmake +++ b/cmake/cmake-2.8.0-modules/osg/FindosgFX.cmake @@ -34,6 +34,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-2.8.0-modules/osg/FindosgGA.cmake b/cmake/cmake-2.8.0-modules/osg/FindosgGA.cmake index 1e0f06e27..a10297f8a 100644 --- a/cmake/cmake-2.8.0-modules/osg/FindosgGA.cmake +++ b/cmake/cmake-2.8.0-modules/osg/FindosgGA.cmake @@ -34,6 +34,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-2.8.0-modules/osg/FindosgIntrospection.cmake b/cmake/cmake-2.8.0-modules/osg/FindosgIntrospection.cmake index 0ebb45f2e..79f3e4794 100644 --- a/cmake/cmake-2.8.0-modules/osg/FindosgIntrospection.cmake +++ b/cmake/cmake-2.8.0-modules/osg/FindosgIntrospection.cmake @@ -34,6 +34,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-2.8.0-modules/osg/FindosgManipulator.cmake b/cmake/cmake-2.8.0-modules/osg/FindosgManipulator.cmake index b2362aab6..a288b4b86 100644 --- a/cmake/cmake-2.8.0-modules/osg/FindosgManipulator.cmake +++ b/cmake/cmake-2.8.0-modules/osg/FindosgManipulator.cmake @@ -34,6 +34,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-2.8.0-modules/osg/FindosgParticle.cmake b/cmake/cmake-2.8.0-modules/osg/FindosgParticle.cmake index c668739ba..dde4edfb3 100644 --- a/cmake/cmake-2.8.0-modules/osg/FindosgParticle.cmake +++ b/cmake/cmake-2.8.0-modules/osg/FindosgParticle.cmake @@ -34,6 +34,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-2.8.0-modules/osg/FindosgProducer.cmake b/cmake/cmake-2.8.0-modules/osg/FindosgProducer.cmake index dd28b1634..1e9064f9b 100644 --- a/cmake/cmake-2.8.0-modules/osg/FindosgProducer.cmake +++ b/cmake/cmake-2.8.0-modules/osg/FindosgProducer.cmake @@ -34,6 +34,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-2.8.0-modules/osg/FindosgShadow.cmake b/cmake/cmake-2.8.0-modules/osg/FindosgShadow.cmake index 60da582a7..6b18dbe83 100644 --- a/cmake/cmake-2.8.0-modules/osg/FindosgShadow.cmake +++ b/cmake/cmake-2.8.0-modules/osg/FindosgShadow.cmake @@ -34,6 +34,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-2.8.0-modules/osg/FindosgSim.cmake b/cmake/cmake-2.8.0-modules/osg/FindosgSim.cmake index 14c390983..c6c4b8692 100644 --- a/cmake/cmake-2.8.0-modules/osg/FindosgSim.cmake +++ b/cmake/cmake-2.8.0-modules/osg/FindosgSim.cmake @@ -34,6 +34,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-2.8.0-modules/osg/FindosgTerrain.cmake b/cmake/cmake-2.8.0-modules/osg/FindosgTerrain.cmake index 20cf56901..e2cd810cb 100644 --- a/cmake/cmake-2.8.0-modules/osg/FindosgTerrain.cmake +++ b/cmake/cmake-2.8.0-modules/osg/FindosgTerrain.cmake @@ -34,6 +34,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-2.8.0-modules/osg/FindosgText.cmake b/cmake/cmake-2.8.0-modules/osg/FindosgText.cmake index 81f9740ab..84a7640cd 100644 --- a/cmake/cmake-2.8.0-modules/osg/FindosgText.cmake +++ b/cmake/cmake-2.8.0-modules/osg/FindosgText.cmake @@ -34,6 +34,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-2.8.0-modules/osg/FindosgUtil.cmake b/cmake/cmake-2.8.0-modules/osg/FindosgUtil.cmake index 088409640..7f760c366 100644 --- a/cmake/cmake-2.8.0-modules/osg/FindosgUtil.cmake +++ b/cmake/cmake-2.8.0-modules/osg/FindosgUtil.cmake @@ -34,6 +34,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-2.8.0-modules/osg/FindosgViewer.cmake b/cmake/cmake-2.8.0-modules/osg/FindosgViewer.cmake index 04df41334..8ecb4ed6a 100644 --- a/cmake/cmake-2.8.0-modules/osg/FindosgViewer.cmake +++ b/cmake/cmake-2.8.0-modules/osg/FindosgViewer.cmake @@ -34,6 +34,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-2.8.0-modules/osg/FindosgVolume.cmake b/cmake/cmake-2.8.0-modules/osg/FindosgVolume.cmake index 6c666c47b..dd4bd611f 100644 --- a/cmake/cmake-2.8.0-modules/osg/FindosgVolume.cmake +++ b/cmake/cmake-2.8.0-modules/osg/FindosgVolume.cmake @@ -34,6 +34,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-2.8.0-modules/osg/FindosgWidget.cmake b/cmake/cmake-2.8.0-modules/osg/FindosgWidget.cmake index 227bbce40..cb9a7dd7a 100644 --- a/cmake/cmake-2.8.0-modules/osg/FindosgWidget.cmake +++ b/cmake/cmake-2.8.0-modules/osg/FindosgWidget.cmake @@ -34,6 +34,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-2.8.0-modules/osg/Findosg_functions.cmake b/cmake/cmake-2.8.0-modules/osg/Findosg_functions.cmake index 19f180350..a13a2b2cf 100644 --- a/cmake/cmake-2.8.0-modules/osg/Findosg_functions.cmake +++ b/cmake/cmake-2.8.0-modules/osg/Findosg_functions.cmake @@ -13,6 +13,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-2.8.1-modules/patchctestbug10149/CTest.cmake b/cmake/cmake-2.8.1-modules/patchctestbug10149/CTest.cmake index 0c5aaf4e0..982370bf2 100644 --- a/cmake/cmake-2.8.1-modules/patchctestbug10149/CTest.cmake +++ b/cmake/cmake-2.8.1-modules/patchctestbug10149/CTest.cmake @@ -54,6 +54,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-2.8.1-modules/patchctestbug10149/CTestScriptMode.cmake b/cmake/cmake-2.8.1-modules/patchctestbug10149/CTestScriptMode.cmake index e6ab6341b..692aa4e5a 100644 --- a/cmake/cmake-2.8.1-modules/patchctestbug10149/CTestScriptMode.cmake +++ b/cmake/cmake-2.8.1-modules/patchctestbug10149/CTestScriptMode.cmake @@ -10,6 +10,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-2.8.1-modules/patchctestbug10149/CTestTargets.cmake b/cmake/cmake-2.8.1-modules/patchctestbug10149/CTestTargets.cmake index a964a039f..469b514e3 100644 --- a/cmake/cmake-2.8.1-modules/patchctestbug10149/CTestTargets.cmake +++ b/cmake/cmake-2.8.1-modules/patchctestbug10149/CTestTargets.cmake @@ -3,14 +3,13 @@ # Copyright 2005-2009 Kitware, Inc. # # Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# Distributed under the OSI-approved BSD License (the "License"); # see below. # # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-2.8.12-modules/CMakePackageConfigHelpers.cmake b/cmake/cmake-2.8.12-modules/CMakePackageConfigHelpers.cmake index 6ad4aba8a..bdeada841 100644 --- a/cmake/cmake-2.8.12-modules/CMakePackageConfigHelpers.cmake +++ b/cmake/cmake-2.8.12-modules/CMakePackageConfigHelpers.cmake @@ -189,6 +189,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-2.8.12-modules/CMakeParseArguments.cmake b/cmake/cmake-2.8.12-modules/CMakeParseArguments.cmake index 3c8002272..5099f83fc 100644 --- a/cmake/cmake-2.8.12-modules/CMakeParseArguments.cmake +++ b/cmake/cmake-2.8.12-modules/CMakeParseArguments.cmake @@ -91,6 +91,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-2.8.3-modules/FixWinInstallPrefix.cmake b/cmake/cmake-2.8.3-modules/FixWinInstallPrefix.cmake index ceb180baa..a65d99151 100644 --- a/cmake/cmake-2.8.3-modules/FixWinInstallPrefix.cmake +++ b/cmake/cmake-2.8.3-modules/FixWinInstallPrefix.cmake @@ -8,14 +8,17 @@ # obviously) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # Distributed under the Boost Software License, Version 1.0. -# (See accompanying file ../LICENSE_1_0.txt or copy at +# (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +# +# SPDX-License-Identifier: BSL-1.0 if(WIN32) # caution - ENV{ProgramFiles} on Win64 is adjusted to point to the arch diff --git a/cmake/cmake-2.8.3-modules/autoinclude.cmake b/cmake/cmake-2.8.3-modules/autoinclude.cmake index 64d8f62b9..4e0dbb542 100644 --- a/cmake/cmake-2.8.3-modules/autoinclude.cmake +++ b/cmake/cmake-2.8.3-modules/autoinclude.cmake @@ -1,13 +1,16 @@ # - Autoinclude these policies automatically # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # Distributed under the Boost Software License, Version 1.0. -# (See accompanying file ../LICENSE_1_0.txt or copy at +# (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +# +# SPDX-License-Identifier: BSL-1.0 include(FixWinInstallPrefix) diff --git a/cmake/cmake-2.8.4-modules/ImproveEclipseGCCErrors.cmake b/cmake/cmake-2.8.4-modules/ImproveEclipseGCCErrors.cmake index 2f7f3170d..1bab71f37 100644 --- a/cmake/cmake-2.8.4-modules/ImproveEclipseGCCErrors.cmake +++ b/cmake/cmake-2.8.4-modules/ImproveEclipseGCCErrors.cmake @@ -4,14 +4,17 @@ # # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # Distributed under the Boost Software License, Version 1.0. -# (See accompanying file ../LICENSE_1_0.txt or copy at +# (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +# +# SPDX-License-Identifier: BSL-1.0 if("${CMAKE_GENERATOR}" MATCHES "Eclipse" AND CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fmessage-length=0") diff --git a/cmake/cmake-2.8.4-modules/autoinclude.cmake b/cmake/cmake-2.8.4-modules/autoinclude.cmake index 2c98e2499..10da6ba30 100644 --- a/cmake/cmake-2.8.4-modules/autoinclude.cmake +++ b/cmake/cmake-2.8.4-modules/autoinclude.cmake @@ -1,13 +1,16 @@ # - Autoinclude these policies automatically # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # Distributed under the Boost Software License, Version 1.0. -# (See accompanying file ../LICENSE_1_0.txt or copy at +# (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +# +# SPDX-License-Identifier: BSL-1.0 include(ImproveEclipseGCCErrors) diff --git a/cmake/cmake-2.8.4-modules/boost/FindBoost.cmake b/cmake/cmake-2.8.4-modules/boost/FindBoost.cmake index 9dbfb8023..2cb9d95c5 100644 --- a/cmake/cmake-2.8.4-modules/boost/FindBoost.cmake +++ b/cmake/cmake-2.8.4-modules/boost/FindBoost.cmake @@ -232,6 +232,8 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-3.2.0-modules/FindGit.cmake b/cmake/cmake-3.2.0-modules/FindGit.cmake index c0ea1d6bf..275cefa64 100644 --- a/cmake/cmake-3.2.0-modules/FindGit.cmake +++ b/cmake/cmake-3.2.0-modules/FindGit.cmake @@ -31,24 +31,26 @@ # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. -#============================================================================= # +# SPDX-License-Identifier: BSD-3-Clause +#============================================================================= +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: -# +# # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. -# +# # * Neither the names of Kitware, Inc., the Insight Software Consortium, # nor the names of their contributors may be used to endorse or promote # products derived from this software without specific prior written # permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR diff --git a/cmake/cmake-3.3.0-modules/WriteCompilerDetectionHeader.cmake b/cmake/cmake-3.3.0-modules/WriteCompilerDetectionHeader.cmake index b40d824b1..578ac069a 100644 --- a/cmake/cmake-3.3.0-modules/WriteCompilerDetectionHeader.cmake +++ b/cmake/cmake-3.3.0-modules/WriteCompilerDetectionHeader.cmake @@ -216,11 +216,13 @@ # Copyright 2014 Stephen Kelly # # Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. +# see below. # # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. +# +# SPDX-License-Identifier: BSD-3-Clause #============================================================================= # # Redistribution and use in source and binary forms, with or without diff --git a/cmake/cmake-4.0.0-modules/RequireOutOfSourceBuild.cmake b/cmake/cmake-4.0.0-modules/RequireOutOfSourceBuild.cmake index 9b27970b5..54e5ded50 100644 --- a/cmake/cmake-4.0.0-modules/RequireOutOfSourceBuild.cmake +++ b/cmake/cmake-4.0.0-modules/RequireOutOfSourceBuild.cmake @@ -4,14 +4,17 @@ # # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # Distributed under the Boost Software License, Version 1.0. -# (See accompanying file ../LICENSE_1_0.txt or copy at +# (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +# +# SPDX-License-Identifier: BSL-1.0 get_filename_component(_src "${CMAKE_SOURCE_DIR}" ABSOLUTE) get_filename_component(_cur_src "${CMAKE_CURRENT_SOURCE_DIR}" ABSOLUTE) @@ -39,6 +42,6 @@ foreach(_var ${_test}) if("${_bin}" STREQUAL "${_chopped}") get_filename_component(_parent "${CMAKE_SOURCE_DIR}/.." ABSOLUTE) message(FATAL_ERROR - "You must set a binary directory that is different from your source directory. You might consider ${CMAKE_SOURCE_DIR}/build or ${_parent}/build-${CMAKE_PROJECT_NAME}") + "You must set a binary directory that is different from your source directory. You might consider cmake options: -B${CMAKE_SOURCE_DIR}/build or -B${_parent}/build-${CMAKE_PROJECT_NAME}") endif() endforeach() diff --git a/cmake/cmake-4.0.0-modules/autoinclude.cmake b/cmake/cmake-4.0.0-modules/autoinclude.cmake index e9206ee08..d10c2a106 100644 --- a/cmake/cmake-4.0.0-modules/autoinclude.cmake +++ b/cmake/cmake-4.0.0-modules/autoinclude.cmake @@ -1,13 +1,16 @@ # - Autoinclude these policies automatically # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # Distributed under the Boost Software License, Version 1.0. -# (See accompanying file ../LICENSE_1_0.txt or copy at +# (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +# +# SPDX-License-Identifier: BSL-1.0 include(RequireOutOfSourceBuild) diff --git a/cmake/ghost-fake-stl/alloc.h b/cmake/ghost-fake-stl/alloc.h index cc8883f51..b822d859e 100644 --- a/cmake/ghost-fake-stl/alloc.h +++ b/cmake/ghost-fake-stl/alloc.h @@ -4,11 +4,13 @@ @date 2012 @author - Ryan Pavlik - and - http://academic.cleardefinition.com/ + Rylie Pavlik + and + https://ryliepavlik.com/ Iowa State University Virtual Reality Applications Center Human-Computer Interaction Graduate Program */ +// Copyright 2012, Iowa State University +// SPDX-License-Identifier: BSL-1.0 #pragma once diff --git a/cmake/ghost-fake-stl/hash_map.h b/cmake/ghost-fake-stl/hash_map.h index fcf3f0d0b..a5df1b8ec 100644 --- a/cmake/ghost-fake-stl/hash_map.h +++ b/cmake/ghost-fake-stl/hash_map.h @@ -4,12 +4,14 @@ @date 2012 @author - Ryan Pavlik - and - http://academic.cleardefinition.com/ + Rylie Pavlik + and + https://ryliepavlik.com/ Iowa State University Virtual Reality Applications Center Human-Computer Interaction Graduate Program */ +// Copyright 2012, Iowa State University +// SPDX-License-Identifier: BSL-1.0 #pragma once diff --git a/cmake/ghost-fake-stl/iostream.h b/cmake/ghost-fake-stl/iostream.h index 7d7195fd2..af251c8d6 100644 --- a/cmake/ghost-fake-stl/iostream.h +++ b/cmake/ghost-fake-stl/iostream.h @@ -4,12 +4,14 @@ @date 2010 @author - Ryan Pavlik - and - http://academic.cleardefinition.com/ + Rylie Pavlik + and + https://ryliepavlik.com/ Iowa State University Virtual Reality Applications Center Human-Computer Interaction Graduate Program */ +// Copyright 2010, Iowa State University +// SPDX-License-Identifier: BSL-1.0 #pragma once @@ -17,4 +19,4 @@ using std::istream; using std::ostream; using std::cerr; -using std::endl; \ No newline at end of file +using std::endl; diff --git a/cmake/ghost-fake-stl/list.h b/cmake/ghost-fake-stl/list.h index a8b3fc24d..745fa4c6d 100644 --- a/cmake/ghost-fake-stl/list.h +++ b/cmake/ghost-fake-stl/list.h @@ -4,12 +4,14 @@ @date 2010 @author - Ryan Pavlik - and - http://academic.cleardefinition.com/ + Rylie Pavlik + and + https://ryliepavlik.com/ Iowa State University Virtual Reality Applications Center Human-Computer Interaction Graduate Program */ +// Copyright 2010, Iowa State University +// SPDX-License-Identifier: BSL-1.0 #pragma once @@ -17,4 +19,4 @@ using std::list; // Disable dll export that depends on the SGI STL implementation -#undef GHOST_EXTRA_TEMPLATE_DECLARATIONS \ No newline at end of file +#undef GHOST_EXTRA_TEMPLATE_DECLARATIONS diff --git a/cmake/ghost-fake-stl/pair.h b/cmake/ghost-fake-stl/pair.h index af793b553..b0f58e97b 100644 --- a/cmake/ghost-fake-stl/pair.h +++ b/cmake/ghost-fake-stl/pair.h @@ -4,12 +4,14 @@ @date 2012 @author - Ryan Pavlik - and - http://academic.cleardefinition.com/ + Rylie Pavlik + and + https://ryliepavlik.com/ Iowa State University Virtual Reality Applications Center Human-Computer Interaction Graduate Program */ +// Copyright 2012, Iowa State University +// SPDX-License-Identifier: BSL-1.0 #pragma once diff --git a/cmake/ghost-fake-stl/set.h b/cmake/ghost-fake-stl/set.h index 880696135..01d93f19c 100644 --- a/cmake/ghost-fake-stl/set.h +++ b/cmake/ghost-fake-stl/set.h @@ -4,16 +4,18 @@ @date 2010 @author - Ryan Pavlik - and - http://academic.cleardefinition.com/ + Rylie Pavlik + and + https://ryliepavlik.com/ Iowa State University Virtual Reality Applications Center Human-Computer Interaction Graduate Program */ +// Copyright 2010, Iowa State University +// SPDX-License-Identifier: BSL-1.0 #pragma once #include #include using std::set; -using std::less; \ No newline at end of file +using std::less; diff --git a/cmake/ghost-fake-stl/vector.h b/cmake/ghost-fake-stl/vector.h index 659db2d68..d529348bb 100644 --- a/cmake/ghost-fake-stl/vector.h +++ b/cmake/ghost-fake-stl/vector.h @@ -4,12 +4,14 @@ @date 2010 @author - Ryan Pavlik - and - http://academic.cleardefinition.com/ + Rylie Pavlik + and + https://ryliepavlik.com/ Iowa State University Virtual Reality Applications Center Human-Computer Interaction Graduate Program */ +// Copyright 2010, Iowa State University +// SPDX-License-Identifier: BSL-1.0 #pragma once @@ -17,4 +19,4 @@ using std::vector; // Disable dll export that depends on the SGI STL implementation -#undef GHOST_EXTRA_TEMPLATE_DECLARATIONS \ No newline at end of file +#undef GHOST_EXTRA_TEMPLATE_DECLARATIONS diff --git a/cmake/launcher-templates/genericlauncher.cmd.in b/cmake/launcher-templates/genericlauncher.cmd.in index 9a19bbc7a..a9114b577 100644 --- a/cmake/launcher-templates/genericlauncher.cmd.in +++ b/cmake/launcher-templates/genericlauncher.cmd.in @@ -1,3 +1,6 @@ +rem Copyright 2010, 2014 Iowa State University +rem SPDX-License-Identifier: BSL-1.0 + cd @USERFILE_WORKING_DIRECTORY@ @USERFILE_ENV_COMMANDS@ @@ -11,4 +14,4 @@ GOTO EOF :SkipDebuggingMess %* -:EOF \ No newline at end of file +:EOF diff --git a/cmake/launcher-templates/genericlauncher.sh.in b/cmake/launcher-templates/genericlauncher.sh.in index 18720517a..e62e1c944 100644 --- a/cmake/launcher-templates/genericlauncher.sh.in +++ b/cmake/launcher-templates/genericlauncher.sh.in @@ -1,4 +1,7 @@ #!/bin/sh +# Copyright 2010-2011, Iowa State University +# SPDX-License-Identifier: BSL-1.0 + bindir=$(pwd) cd @USERFILE_WORKING_DIRECTORY@ @USERFILE_ENV_COMMANDS@ diff --git a/cmake/launcher-templates/launcher.env.cmd.in b/cmake/launcher-templates/launcher.env.cmd.in index 72a24e67e..4cfdc9bff 100644 --- a/cmake/launcher-templates/launcher.env.cmd.in +++ b/cmake/launcher-templates/launcher.env.cmd.in @@ -1 +1,3 @@ +rem Copyright 2010, 2014 Iowa State University +rem SPDX-License-Identifier: BSL-1.0 set @_arg@ diff --git a/cmake/launcher-templates/launcher.env.sh.in b/cmake/launcher-templates/launcher.env.sh.in index 428cffffb..8ab033707 100644 --- a/cmake/launcher-templates/launcher.env.sh.in +++ b/cmake/launcher-templates/launcher.env.sh.in @@ -1 +1,3 @@ +# Copyright 2010, Iowa State University +# SPDX-License-Identifier: BSL-1.0 export @_arg@ diff --git a/cmake/launcher-templates/perconfig.vcproj.user.in b/cmake/launcher-templates/perconfig.vcproj.user.in index 95cacecff..c5af37f4f 100644 --- a/cmake/launcher-templates/perconfig.vcproj.user.in +++ b/cmake/launcher-templates/perconfig.vcproj.user.in @@ -1,8 +1,13 @@ + @USERFILE_ENVIRONMENT@ WindowsLocalDebugger - ${USERFILE_@USERFILE_CONFIGNAME@_COMMAND} + @USERFILE_COMMAND@ @USERFILE_COMMAND_ARGUMENTS@ @USERFILE_WORKING_DIRECTORY@ diff --git a/cmake/launcher-templates/targetlauncher.cmd.in b/cmake/launcher-templates/targetlauncher.cmd.in index c5715d679..f35ed5f8c 100644 --- a/cmake/launcher-templates/targetlauncher.cmd.in +++ b/cmake/launcher-templates/targetlauncher.cmd.in @@ -1,3 +1,5 @@ +rem Copyright 2010, 2014 Iowa State University +rem SPDX-License-Identifier: BSL-1.0 cd @USERFILE_WORKING_DIRECTORY@ @USERFILE_ENV_COMMANDS@ if [%1]==[--debugger] ( diff --git a/cmake/launcher-templates/targetlauncher.sh.in b/cmake/launcher-templates/targetlauncher.sh.in index b4b6d7309..4c0c8b1e3 100644 --- a/cmake/launcher-templates/targetlauncher.sh.in +++ b/cmake/launcher-templates/targetlauncher.sh.in @@ -1,4 +1,7 @@ #!/bin/sh +# Copyright 2010-2011, Iowa State University +# SPDX-License-Identifier: BSL-1.0 + bindir=$(pwd) cd @USERFILE_WORKING_DIRECTORY@ @USERFILE_ENV_COMMANDS@ diff --git a/cmake/launcher-templates/vcproj.user.in b/cmake/launcher-templates/vcproj.user.in index 117473d70..5a2822666 100644 --- a/cmake/launcher-templates/vcproj.user.in +++ b/cmake/launcher-templates/vcproj.user.in @@ -1,4 +1,8 @@ + + @USERFILE_CONFIGSECTIONS@ diff --git a/cmake/module-docs/AllModuleDependencies.dot b/cmake/module-docs/AllModuleDependencies.dot index 9110002e6..fe2be4cff 100644 --- a/cmake/module-docs/AllModuleDependencies.dot +++ b/cmake/module-docs/AllModuleDependencies.dot @@ -1,3 +1,11 @@ +# Copyright 2009-2010, Iowa State University +# +# 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) +# +# SPDX-License-Identifier: BSL-1.0 + digraph { size="7.5,10" nodesep = .25 diff --git a/cmake/module-docs/AllModuleDependencies.jpg.license b/cmake/module-docs/AllModuleDependencies.jpg.license new file mode 100644 index 000000000..9326654b6 --- /dev/null +++ b/cmake/module-docs/AllModuleDependencies.jpg.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2009-2010 Iowa State University + +SPDX-License-Identifier: BSL-1.0 \ No newline at end of file diff --git a/cmake/module-docs/AllModuleDependencies.pdf.license b/cmake/module-docs/AllModuleDependencies.pdf.license new file mode 100644 index 000000000..9326654b6 --- /dev/null +++ b/cmake/module-docs/AllModuleDependencies.pdf.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2009-2010 Iowa State University + +SPDX-License-Identifier: BSL-1.0 \ No newline at end of file diff --git a/cmake/module-docs/AllModuleDependencies.png.license b/cmake/module-docs/AllModuleDependencies.png.license new file mode 100644 index 000000000..9326654b6 --- /dev/null +++ b/cmake/module-docs/AllModuleDependencies.png.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2009-2010 Iowa State University + +SPDX-License-Identifier: BSL-1.0 \ No newline at end of file diff --git a/cmake/module-docs/Example-FindMyPackage-UsingImportedTargets.cmake b/cmake/module-docs/Example-FindMyPackage-UsingImportedTargets.cmake index 23ac10b2b..7ddf7cf0e 100644 --- a/cmake/module-docs/Example-FindMyPackage-UsingImportedTargets.cmake +++ b/cmake/module-docs/Example-FindMyPackage-UsingImportedTargets.cmake @@ -54,9 +54,17 @@ # FindPackageHandleStandardArgs (CMake standard module) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC +# +# Copyright 2009-2010, Iowa State University +# +# 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) +# +# SPDX-License-Identifier: BSL-1.0 set(MYPACKAGE_ROOT "${MYPACKAGE_ROOT}" diff --git a/cmake/module-docs/Example-FindMyPackage.cmake b/cmake/module-docs/Example-FindMyPackage.cmake index cdf3bfcad..e5359b540 100644 --- a/cmake/module-docs/Example-FindMyPackage.cmake +++ b/cmake/module-docs/Example-FindMyPackage.cmake @@ -73,9 +73,17 @@ # FindPackageHandleStandardArgs (CMake standard module) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC +# +# Copyright 2009-2010, Iowa State University +# +# 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) +# +# SPDX-License-Identifier: BSL-1.0 set(MYPACKAGE_ROOT "${MYPACKAGE_ROOT}" diff --git a/cmake/module-docs/Example-FindMySimplePackage.cmake b/cmake/module-docs/Example-FindMySimplePackage.cmake index 678b8684e..b635024ba 100644 --- a/cmake/module-docs/Example-FindMySimplePackage.cmake +++ b/cmake/module-docs/Example-FindMySimplePackage.cmake @@ -20,14 +20,17 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 set(MYSIMPLEPACKAGE_ROOT_DIR "${MYSIMPLEPACKAGE_ROOT_DIR}" diff --git a/cmake/module-help.html b/cmake/module-help.html index e051192bd..dda6020ee 100644 --- a/cmake/module-help.html +++ b/cmake/module-help.html @@ -169,7 +169,7 @@

Custom CMake Modules


Requires CMake 2.6 or newer (uses the 'function' command)

Requires: GetForceIncludeDefinitions CopyResourcesToBuildTree

-

Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

+

Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

@@ -185,7 +185,7 @@

Custom CMake Modules

Requires these CMake modules:

  no additional modules required


-

Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

+

Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

@@ -197,7 +197,7 @@

Custom CMake Modules

Requires these CMake modules:

  no additional modules required


-

Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

+

Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

@@ -209,7 +209,7 @@

Custom CMake Modules

Requires these CMake modules:

  FindVRJuggler22 and its dependencies


-

Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

+

Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

@@ -221,7 +221,7 @@

Custom CMake Modules

Requires these CMake modules:

  FindVRJuggler22 and its dependencies


-

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>

+

Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Updated for VR Juggler 3.0 by: Brandon Newendorp <brandon@newendorp.com>

  • @@ -231,7 +231,7 @@

    Custom CMake Modules

    Use add_definitions(-DMACOSX_HID_UINT32T=${MACOSX_HID_UINT32T}) in your listfile and the following prototype for the function you'd like to register using setInterruptReportHandlerCallback:

      void ReaderReportCallback(
                                void *target,
                                IOReturn result,
                                void *refcon,
                                void *sender,
                                MACOSX_HID_UINT32T size
                                )


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    • @@ -241,7 +241,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      no additional modules required


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -251,7 +251,7 @@

    Custom CMake Modules

      clean_directory_list(<listvar> [<additional list items>...])


    Requires CMake 2.6 or newer (uses the 'function' command)

    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -263,7 +263,7 @@

    Custom CMake Modules


    Removes duplicates from the list, leaving only the last instance, while preserving the meaning of the "optimized", "debug", and "general" labeling. (Libraries listed as general are listed in the result instead as optimized and debug)

    Requires CMake 2.6 or newer (uses the 'function' command)

    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -273,7 +273,7 @@

    Custom CMake Modules

      copy_resources_to_build_tree(<target_name>)


    Requires CMake 2.6 or newer (uses the 'function' command)

    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -286,7 +286,7 @@

    Custom CMake Modules

      Findcppcheck


    Requires CMake 2.6 or newer (uses the 'function' command)

    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -303,7 +303,7 @@

    Custom CMake Modules

      GetCompilerInfoString


    Requires CMake 2.6 or newer (uses the 'function' command)

    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -314,7 +314,7 @@

    Custom CMake Modules


    Removes duplicates from the list then sorts while preserving "optimized", "debug", and "general" labeling

    Requires CMake 2.6 or newer (uses the 'function' command)

    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -331,7 +331,7 @@

    Custom CMake Modules

      ListFilter
      ProgramFilesGlob
      CleanDirectoryList


    Requires CMake 2.6 or newer (uses the 'function' command)

    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -344,7 +344,7 @@

    Custom CMake Modules

      FindDoxygen


    Requires CMake 2.6 or newer (uses the 'function' command)

    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -354,7 +354,7 @@

    Custom CMake Modules

      enable_extra_compiler_warnings(<targetname>)
      globally_enable_extra_compiler_warnings() - to modify CMAKE_CXX_FLAGS, etc
        to change for all targets declared after the command, instead of per-command



    -

    Original Author: 2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -364,7 +364,7 @@

    Custom CMake Modules

      enable_profiling(<targetname>)
      globally_enable_profiling() - to modify CMAKE_CXX_FLAGS, etc
        to change for all targets declared after the command, instead of per-command



    -

    Original Author: 2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -377,7 +377,7 @@

    Custom CMake Modules



    Requires CMake 2.6 or newer (uses the 'function' command)

    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -396,7 +396,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -422,7 +422,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    -

    Original Author: 2012 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2012 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    Copyright Iowa State University 2012. 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)

    @@ -438,7 +438,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -452,7 +452,7 @@

    Custom CMake Modules


    This script will use Flagpoll, if found, to provide hints to the location of this library, but does not use the compiler flags returned by Flagpoll directly.

    VR Juggler requires this package, so this Find script takes that into account when determining where to search for the desired files. The VJ_BASE_DIR environment variable is searched (preferentially) when searching for this package, so most sane VR Juggler build environments should "just work." Note that you need to manually re-run CMake if you change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run.

    -

    Original Author: 2009-2012 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2012 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    Copyright Iowa State University 2009-2012. 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)

    @@ -465,7 +465,7 @@

    Custom CMake Modules

    Useful configuration variables you might want to add to your cache:

      DCUBED_ROOT_DIR - A directory prefix to search
                             (a path that contains include/ as a subdirectory)


    -

    2009-2010 Ryan Pavlik <rpavlik@iastate.edu> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> 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)

    @@ -481,7 +481,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    -

    Original Author: 2011 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2011 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    Copyright Iowa State University 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)

    @@ -494,7 +494,7 @@

    Custom CMake Modules

      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    Initially in VRPN - Distributed under the Boost Software License, Version 1.0.

    -

    Almost entirely re-written by: 2012 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Almost entirely re-written by: 2012 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    Copyright Iowa State University 2012. 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)

    @@ -510,7 +510,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)
      SelectLibraryConfigurations


    -

    Original Author: 2012 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2012 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    Copyright Iowa State University 2012. 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)

    @@ -528,7 +528,7 @@

    Custom CMake Modules

    Example usage: flagpoll_get_include_dirs(vpr NO_DEPS) find_path(VPR20_INCLUDE_DIRS vpr/vpr.h

       	  HINTS  ${vpr_FLAGPOLL_INCLUDE_DIRS})


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -541,7 +541,7 @@

    Custom CMake Modules

    Useful configuration variables you might want to add to your cache:

      GDB_ROOT_DIR - A directory prefix to search


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -552,7 +552,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      no additional modules required


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -564,7 +564,7 @@

    Custom CMake Modules

    Useful configuration variables you might want to add to your cache:

       GLUI_ROOT_DIR - A directory prefix to search
                      (usually a path that contains include/ as a subdirectory)


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -586,7 +586,7 @@

    Custom CMake Modules


    This script will use Flagpoll, if found, to provide hints to the location of this library, but does not use the compiler flags returned by Flagpoll directly.

    VR Juggler requires this package, so this Find script takes that into account when determining where to search for the desired files. The VJ_BASE_DIR environment variable is searched (preferentially) when searching for this package, so most sane VR Juggler build environments should "just work." Note that you need to manually re-run CMake if you change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run.

    -

    Original Author: 2009-2012 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2012 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    Copyright Iowa State University 2009-2012. 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)

    @@ -602,7 +602,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -618,7 +618,7 @@

    Custom CMake Modules


    This script will use Flagpoll, if found, to provide hints to the location of this library, but does not use the compiler flags returned by Flagpoll directly.

    The VJ_BASE_DIR environment variable is also searched (preferentially) when searching for this component, so most sane build environments should "just work." Note that you need to manually re-run CMake if you change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run.

    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -634,7 +634,7 @@

    Custom CMake Modules


    This script will use Flagpoll, if found, to provide hints to the location of this library, but does not use the compiler flags returned by Flagpoll directly.

    The VJ_BASE_DIR environment variable is also searched (preferentially) when searching for this component, so most sane build environments should "just work." Note that you need to manually re-run CMake if you change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run.

    -

    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>

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Updated for VR Juggler 3.0 by: Brandon Newendorp <brandon@newendorp.com>

  • @@ -649,7 +649,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      CleanDirectoryList
      CleanLibraryList
      ListCombinations
      ProgramFilesGlob
      SelectLibraryConfigurations (included with CMake >=2.8.0)
      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    • @@ -665,7 +665,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -682,7 +682,7 @@

    Custom CMake Modules

    Because the files generated from an IDL file are not entirely predictable, java_idlj runs idlj in the cmake step, rather than the build step, and triggers a CMake re-run when an idl file is modified. Already up-to-date generated source is not re-generated, however.

    Files are generated in a directory created specifically for the particular IDL file and the particular call, in the build directory - there should be no worries about overwriting files or picking up too much with the wildcard.

    You may wish to add the IDL file to your list of sources if you want it to appear in your IDE, but it is not necessary.

    -

    Original Author: 2012 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2012 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    Copyright Iowa State University 2012. 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)

    @@ -699,8 +699,8 @@

    Custom CMake Modules

      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    Author: 2013 Eric Marsh <bits@wemarsh.com> http://wemarsh.com/ Kognitiv Neuroinformatik, Universität Bremen

    -

    (building on Ryan Pavlik's templates)

    -

    2013 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    (building on Rylie Pavlik's templates)

    +

    2013 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    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)

    @@ -716,7 +716,7 @@

    Custom CMake Modules


    This script will use Flagpoll, if found, to provide hints to the location of this library, but does not use the compiler flags returned by Flagpoll directly.

    The VJ_BASE_DIR environment variable is also searched (preferentially) when searching for this component, so most sane build environments should "just work." Note that you need to manually re-run CMake if you change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run.

    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -732,7 +732,7 @@

    Custom CMake Modules


    This script will use Flagpoll, if found, to provide hints to the location of this library, but does not use the compiler flags returned by Flagpoll directly.

    The VJ_BASE_DIR environment variable is also searched (preferentially) when searching for this component, so most sane build environments should "just work." Note that you need to manually re-run CMake if you change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run.

    -

    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>

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Updated for VR Juggler 3.0 by: Brandon Newendorp <brandon@newendorp.com>

  • @@ -747,7 +747,7 @@

    Custom CMake Modules

    Useful configuration variables you might want to add to your cache:

      JTTK_ROOT_DIR - A directory prefix to search
                             (a path that contains include/ as a subdirectory)


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    • @@ -759,7 +759,7 @@

    Custom CMake Modules

    Users may wish to set:

      LAPACKLIBS_ROOT_DIR, location to start searching for LAPACK libraries


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -775,7 +775,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      ProgramFilesGlob
      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -791,7 +791,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -813,7 +813,7 @@

    Custom CMake Modules

    Useful configuration variables you might want to add to your cache:

      LYX_ROOT_DIR - A directory prefix to search


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -829,7 +829,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      CheckMacHIDAPI
      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -845,7 +845,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    -

    Original Author: 2011 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2011 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    Copyright Iowa State University 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)

    @@ -861,7 +861,7 @@

    Custom CMake Modules


    2004/05 Jan Woetzel, Friso, Daniel Grest 2006/01 complete rewrite by Jan Woetzel 2006/09 2nd rewrite introducing ROOT_DIR and PATH_SUFFIXES

       to handle multiple installed versions gracefully by Jan Woetzel
    -

    2010/02 Ryan Pavlik (Iowa State University) - partial rewrite to standardize

    +

    2010/02 Rylie Pavlik (Iowa State University) - partial rewrite to standardize

    tested with:

    www.mip.informatik.uni-kiel.de/~jw academic.cleardefinition.com

    @@ -878,7 +878,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      CleanDirectoryList
      CleanLibraryList
      ListCombinations
      ProgramFilesGlob
      SelectLibraryConfigurations (included with CMake >=2.8.0)
      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)
      CMake 2.6.3 (uses "unset")


    -

    Original Author: 2009-2012 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2012 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -893,7 +893,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      CheckVersion
      ListCombinations
      ProgramFilesGlob
      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -912,7 +912,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    -

    Original Author: 2012 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2012 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    Copyright Iowa State University 2012. 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)

    @@ -925,7 +925,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    -

    Original Author: 2012 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2012 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    Copyright Iowa State University 2012. 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)

    @@ -944,7 +944,7 @@

    Custom CMake Modules

      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    Refactored from FindVRPN.cmake by: Juan Sebastian Casallas <casallas@iastate.edu>

    -

    FindVRPN.cmake Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    FindVRPN.cmake Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    Copyright Iowa State University 2009-2012. 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)

    @@ -960,7 +960,7 @@

    Custom CMake Modules


    This script will use Flagpoll, if found, to provide hints to the location of this library, but does not use the compiler flags returned by Flagpoll directly.

    The VJ_BASE_DIR environment variable is also searched (preferentially) when searching for this component, so most sane build environments should "just work." Note that you need to manually re-run CMake if you change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run.

    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -976,7 +976,7 @@

    Custom CMake Modules


    This script will use Flagpoll, if found, to provide hints to the location of this library, but does not use the compiler flags returned by Flagpoll directly.

    The VJ_BASE_DIR environment variable is also searched (preferentially) when searching for this component, so most sane build environments should "just work." Note that you need to manually re-run CMake if you change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run.

    -

    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>

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Updated for VR Juggler 3.0 by: Brandon Newendorp <brandon@newendorp.com>

  • @@ -985,7 +985,7 @@

    Custom CMake Modules

      TR1_USE_FILE, which you may "include" in your CMake file to be able
       to use TR1 features transparently
      TR1_INCLUDE_DIRS, any directories needed to access TR1 headers
      TR1_LIBRARY_DIRS, any directories needed to access (auto-link) TR1 libraries
      TR1_FOUND, If false, do not try to use TR1 features.


    If TR1 features are not built-in, we will try to use Boost to substitute for them.

    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    • @@ -1004,7 +1004,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1023,7 +1023,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1039,7 +1039,7 @@

    Custom CMake Modules


    This script will use Flagpoll, if found, to provide hints to the location of this library, but does not use the compiler flags returned by Flagpoll directly.

    The VJ_BASE_DIR environment variable is also searched (preferentially) when searching for this component, so most sane build environments should "just work." Note that you need to manually re-run CMake if you change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run.

    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1055,7 +1055,7 @@

    Custom CMake Modules


    This script will use Flagpoll, if found, to provide hints to the location of this library, but does not use the compiler flags returned by Flagpoll directly.

    The VJ_BASE_DIR environment variable is also searched (preferentially) when searching for this component, so most sane build environments should "just work." Note that you need to manually re-run CMake if you change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run.

    -

    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>

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Updated for VR Juggler 3.0 by: Brandon Newendorp <brandon@newendorp.com>

  • @@ -1070,7 +1070,7 @@

    Custom CMake Modules


    This script will use Flagpoll, if found, to provide hints to the location of this library, but does not use the compiler flags returned by Flagpoll directly.

    The VJ_BASE_DIR environment variable is also searched (preferentially) when searching for this component, so most sane build environments should "just work." Note that you need to manually re-run CMake if you change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run.

    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    • @@ -1086,7 +1086,7 @@

    Custom CMake Modules


    This script will use Flagpoll, if found, to provide hints to the location of this library, but does not use the compiler flags returned by Flagpoll directly.

    The VJ_BASE_DIR environment variable is also searched (preferentially) when searching for this component, so most sane build environments should "just work." Note that you need to manually re-run CMake if you change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run.

    -

    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>

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Updated for VR Juggler 3.0 by: Brandon Newendorp <brandon@newendorp.com>

  • @@ -1098,7 +1098,7 @@

    Custom CMake Modules

    Useful configuration variables you might want to add to your cache:

      VPS_ROOT_DIR - A directory prefix to search
                             (a path that contains include/ as a subdirectory)


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    • @@ -1114,7 +1114,7 @@

    Custom CMake Modules


    This script will use Flagpoll, if found, to provide hints to the location of this library, but does not use the compiler flags returned by Flagpoll directly.

    The VJ_BASE_DIR environment variable is also searched (preferentially) when searching for this component, so most sane build environments should "just work." Note that you need to manually re-run CMake if you change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run.

    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1130,7 +1130,7 @@

    Custom CMake Modules


    This script will use Flagpoll, if found, to provide hints to the location of this library, but does not use the compiler flags returned by Flagpoll directly.

    The VJ_BASE_DIR environment variable is also searched (preferentially) when searching for this component, so most sane build environments should "just work." Note that you need to manually re-run CMake if you change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run.

    -

    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>

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Updated for VR Juggler 3.0 by: Brandon Newendorp <brandon@newendorp.com>

    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)

    @@ -1146,7 +1146,7 @@

    Custom CMake Modules


    This script will use Flagpoll, if found, to provide hints to the location of this library, but does not use the compiler flags returned by Flagpoll directly.

    The VJ_BASE_DIR environment variable is also searched (preferentially) when searching for this component, so most sane build environments should "just work." Note that you need to manually re-run CMake if you change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run.

    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1162,7 +1162,7 @@

    Custom CMake Modules


    This script will use Flagpoll, if found, to provide hints to the location of this library, but does not use the compiler flags returned by Flagpoll directly.

    The VJ_BASE_DIR environment variable is also searched (preferentially) when searching for this component, so most sane build environments should "just work." Note that you need to manually re-run CMake if you change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run.

    -

    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>

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Updated for VR Juggler 3.0 by: Brandon Newendorp <brandon@newendorp.com>

  • @@ -1185,7 +1185,7 @@

    Custom CMake Modules


    The VJ_BASE_DIR environment variable is also searched (preferentially) when seeking any of the above components, as well as Flagpoll, CPPDOM, and Boost (from within VPR), so most sane build environments should "just work."

    IMPORTANT: Note that you need to manually re-run CMake if you change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run.

    -

    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>

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Updated for VR Juggler 3.0 by: Brandon Newendorp <brandon@newendorp.com>

    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)

    • @@ -1209,7 +1209,7 @@

    Custom CMake Modules


    The VJ_BASE_DIR environment variable is also searched (preferentially) when seeking any of the above components, as well as Flagpoll, CPPDOM, and Boost (from within VPR20), so most sane build environments should "just work."

    IMPORTANT: Note that you need to manually re-run CMake if you change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run.

    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1233,7 +1233,7 @@

    Custom CMake Modules


    The VJ_BASE_DIR environment variable is also searched (preferentially) when seeking any of the above components, as well as Flagpoll, CPPDOM, and Boost (from within VPR22), so most sane build environments should "just work."

    IMPORTANT: Note that you need to manually re-run CMake if you change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run.

    -

    Original Author: 2009-2011 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> and Ryan Pavlik

    +

    Original Author: 2009-2011 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Updated for VR Juggler 3.0 by: Brandon Newendorp <brandon@newendorp.com> and Rylie Pavlik

    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)

    @@ -1250,7 +1250,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    -

    Original Author: 2009-2012 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2012 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    Copyright Iowa State University 2009-2012. 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)

    @@ -1266,7 +1266,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    -

    Original Author: 2012 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2012 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    Copyright Iowa State University 2012. 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)

    @@ -1298,7 +1298,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1314,7 +1314,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1330,7 +1330,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)
      PrefixListGlob
      CleanDirectoryList


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1348,7 +1348,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    -

    Original Author: 2012 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2012 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    Copyright Iowa State University 2012. 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)

    @@ -1367,7 +1367,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1383,7 +1383,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1399,7 +1399,7 @@

    Custom CMake Modules

    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

    +

    Original Author: 2009-2011 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1411,7 +1411,7 @@

    Custom CMake Modules

    Functions:

      install_cutil({RUNTIME_LIBRARY_DESTINATION}) - Install the CUTIL shared lib if created.


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1427,7 +1427,7 @@

    Custom CMake Modules

    Useful configuration variables you might want to add to your cache:

      DB2PDF_ROOT_DIR - A directory prefix to search


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1443,7 +1443,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      FindPackageHandleStandardArgs (known included with CMake >=2.6.2)


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1452,7 +1452,7 @@

    Custom CMake Modules

    Find the quatlib headers and libraries.

      QUATLIB_INCLUDE_DIRS - where to find quat.h
      QUATLIB_LIBRARIES    - List of libraries when using quatlib.
      QUATLIB_FOUND        - True if quatlib found.


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1464,7 +1464,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      no additional modules required


    -

    Original Author: 2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1482,9 +1482,9 @@

    Custom CMake Modules

    Requires these CMake modules:

      no additional modules required


    -

    Original Author: 2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    -

    Some functions based on cmake-2.8.0 modules FindBoost.cmake and CTest.cmake ============================================================================= Copyright 2006-2009 Kitware, Inc. Copyright 2006-2008 Andreas Schneider <mail@cynapses.org> Copyright 2007 Wengo Copyright 2007 Mike Jackson Copyright 2008 Andreas Pakulat <apaku@gmx.de> Copyright 2008-2009 Philip Lowman <philip@yhbt.com> Copyright 2010 Iowa State University (Ryan Pavlik <abiryan@ryand.net>)

    +

    Some functions based on cmake-2.8.0 modules FindBoost.cmake and CTest.cmake ============================================================================= Copyright 2006-2009 Kitware, Inc. Copyright 2006-2008 Andreas Schneider <mail@cynapses.org> Copyright 2007 Wengo Copyright 2007 Mike Jackson Copyright 2008 Andreas Pakulat <apaku@gmx.de> Copyright 2008-2009 Philip Lowman <philip@yhbt.com> Copyright 2010 Iowa State University (Rylie Pavlik <rylie@ryliepavlik.com>)

    Distributed under the OSI-approved BSD License (the "License"); see accompanying file Copyright.txt for details.

    This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================= CMake - Cross Platform Makefile Generator Copyright 2000-2009 Kitware, Inc., Insight Software Consortium All rights reserved.

    Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

    @@ -1506,7 +1506,7 @@

    Custom CMake Modules

      get_directory_list(<listvar> <file path> [<additional file paths>...])


    Requires CMake 2.6 or newer (uses the 'function' command)

    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1516,7 +1516,7 @@

    Custom CMake Modules

      get_file_list(<listvar> <file path> [<additional file paths>...])


    Requires CMake 2.6 or newer (uses the 'function' command)

    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1526,7 +1526,7 @@

    Custom CMake Modules

    The most common use of this is to use a generated config.h-type file placed out of the source tree in all files.

      get_force_include_definitions(var forcedincludefiles...) -
       where var is the name of  your desired output variable, and everything
       else is a source file to forcibly include.
       a list item to be filtered.


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1544,7 +1544,7 @@

    Custom CMake Modules


    Returns the results of git describe --exact-match on the source tree, and adjusting the output so that it tests false if there was no exact matching tag.

    Requires CMake 2.6 or newer (uses the 'function' command)

    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1554,14 +1554,14 @@

    Custom CMake Modules

      get_subproject_status(<resultvar>) - resultvar will be YES if we are
       included in another project, or NO if we are being built separately


    Requires CMake 2.6 or newer (uses the 'function' command)

    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

  • Licensing: Building a licensing description file


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    • @@ -1570,7 +1570,7 @@

    Custom CMake Modules


      list_combinations(var PREFIXES listitems... SUFFIXES listitems...) -
       where var is the name of your desired output variable and PREFIXES
       and SUFFIXES are special arguments that indicate the start of your
       list of prefixes or suffixes respectively.


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1581,7 +1581,7 @@

    Custom CMake Modules


      list_filter_out(var regex listitems...) - where var is the name of
       your desired output variable, regex is the regex whose matching items
       will NOT be put in the output variable, and everything else is considered
       a list item to be filtered.


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1596,7 +1596,7 @@

    Custom CMake Modules

      LUA_TARGET_LUAC_EXECUTABLE


    Requires CMake 2.6 or newer (uses the 'function' command)

    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1608,7 +1608,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      ListCombinations.cmake


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1620,7 +1620,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      ListCombinations.cmake


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1633,7 +1633,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      - none


    -

    Original Author: 2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1642,7 +1642,7 @@

    Custom CMake Modules


      option_requires(<option_name> <description> <variable_name> [<variable_name>...])


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1650,7 +1650,7 @@

    Custom CMake Modules

    PrefixListGlob: For each given prefix in a list, glob using the prefix+pattern



    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1660,7 +1660,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      CleanDirectoryList
      PrefixListGlob


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1670,7 +1670,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      no additional modules required


    -

    Original Author: 2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1684,7 +1684,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      ListFilter
      ProgramFilesGlob


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1694,7 +1694,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      no additional modules required


    -

    Original Author: 2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1704,7 +1704,7 @@

    Custom CMake Modules

      split_library_list(_generalvar _releasevar _debugvar)


    Requires CMake 2.6 or newer (uses the 'function' command)

    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1726,7 +1726,7 @@

    Custom CMake Modules


      stamp_sources_with_version(<version> <source> [<source> ...]) -
       Use for files not directly associated with a target.


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1734,7 +1734,7 @@

    Custom CMake Modules

    TCHARWorkaround: Script to compile Win32-developed sources using tchar without modifying the code

    Requires that ${CMAKE_SOURCE_DIR}/cmake/workarounds/tchar/ be present.

    TCHAR_WORKAROUND, automatically set to on when not on win32 TCHAR_INCLUDE_DIR, location of our fake tchar.h file

    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1746,7 +1746,7 @@

    Custom CMake Modules

    Requires these CMake modules:

      CleanDirectoryList


    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1760,7 +1760,7 @@

    Custom CMake Modules



    Requires CMake 2.6 or newer (uses the 'function' command)

    -

    Original Author: 2011 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2011 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    Copyright Iowa State University 2011-2012. 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)

    @@ -1768,7 +1768,7 @@

    Custom CMake Modules

    UseTR1: Use settings to enable access to C++ TR1


    This calls include_directories and link_directories as needed to permit TR1 support.

    -

    Original Author: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2009-2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    @@ -1777,7 +1777,7 @@

    Custom CMake Modules


      warning_dev("your desired message")


    -

    Original Author: 2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC

    +

    Original Author: 2010 Rylie Pavlik <rylie@ryliepavlik.com> <rylie@ryliepavlik.com> 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)

    diff --git a/cmake/module-help.txt b/cmake/module-help.txt index 0a219f088..28fb72ddc 100644 --- a/cmake/module-help.txt +++ b/cmake/module-help.txt @@ -113,8 +113,8 @@ a few. Requires: GetForceIncludeDefinitions CopyResourcesToBuildTree - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -149,8 +149,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -176,8 +176,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -201,8 +201,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -226,8 +226,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Updated for VR Juggler 3.0 by: Brandon Newendorp @@ -253,8 +253,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -273,8 +273,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -292,8 +292,8 @@ a few. Requires CMake 2.6 or newer (uses the 'function' command) - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -323,8 +323,8 @@ a few. Requires CMake 2.6 or newer (uses the 'function' command) - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -342,8 +342,8 @@ a few. Requires CMake 2.6 or newer (uses the 'function' command) - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -371,8 +371,8 @@ a few. Requires CMake 2.6 or newer (uses the 'function' command) - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -410,8 +410,8 @@ a few. Requires CMake 2.6 or newer (uses the 'function' command) - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -433,8 +433,8 @@ a few. Requires CMake 2.6 or newer (uses the 'function' command) - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -484,8 +484,8 @@ a few. Requires CMake 2.6 or newer (uses the 'function' command) - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -517,8 +517,8 @@ a few. Requires CMake 2.6 or newer (uses the 'function' command) - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -538,8 +538,8 @@ a few. - Original Author: 2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -559,8 +559,8 @@ a few. - Original Author: 2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -593,8 +593,8 @@ a few. Requires CMake 2.6 or newer (uses the 'function' command) - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -637,8 +637,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -702,8 +702,8 @@ a few. - Original Author: 2012 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2012 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2012. Distributed under the Boost @@ -736,8 +736,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -778,8 +778,8 @@ a few. change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run. - Original Author: 2009-2012 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2012 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2012. Distributed under the @@ -809,7 +809,7 @@ a few. - 2009-2010 Ryan Pavlik + 2009-2010 Rylie Pavlik http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC @@ -845,8 +845,8 @@ a few. - Original Author: 2011 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2011 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2011. Distributed under the Boost @@ -873,8 +873,8 @@ a few. Initially in VRPN - Distributed under the Boost Software License, Version 1.0. - Almost entirely re-written by: 2012 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Almost entirely re-written by: 2012 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2012. Distributed under the Boost @@ -913,8 +913,8 @@ a few. - Original Author: 2012 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2012 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2012. Distributed under the Boost @@ -962,8 +962,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -990,8 +990,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -1014,8 +1014,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -1042,8 +1042,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -1099,8 +1099,8 @@ a few. change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run. - Original Author: 2009-2012 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2012 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2012. Distributed under the @@ -1133,8 +1133,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -1179,8 +1179,8 @@ a few. change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -1225,8 +1225,8 @@ a few. change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Updated for VR Juggler 3.0 by: Brandon Newendorp @@ -1266,8 +1266,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -1300,8 +1300,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -1345,8 +1345,8 @@ a few. You may wish to add the IDL file to your list of sources if you want it to appear in your IDE, but it is not necessary. - Original Author: 2012 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2012 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2012. Distributed under the Boost @@ -1383,9 +1383,9 @@ a few. Author: 2013 Eric Marsh http://wemarsh.com/ Kognitiv Neuroinformatik, Universität Bremen - (building on Ryan Pavlik's templates) + (building on Rylie Pavlik's templates) - 2013 Ryan Pavlik + 2013 Rylie Pavlik http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC @@ -1430,8 +1430,8 @@ a few. change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -1475,8 +1475,8 @@ a few. change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Updated for VR Juggler 3.0 by: Brandon Newendorp @@ -1511,8 +1511,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -1535,8 +1535,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -1570,8 +1570,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -1604,8 +1604,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -1658,8 +1658,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -1697,8 +1697,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -1728,8 +1728,8 @@ a few. - Original Author: 2011 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2011 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2011. Distributed under the Boost @@ -1762,7 +1762,7 @@ a few. to handle multiple installed versions gracefully by Jan Woetzel - 2010/02 Ryan Pavlik (Iowa State University) - partial rewrite to + 2010/02 Rylie Pavlik (Iowa State University) - partial rewrite to standardize tested with: @@ -1826,8 +1826,8 @@ a few. - Original Author: 2009-2012 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2012 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -1862,8 +1862,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -1906,8 +1906,8 @@ a few. - Original Author: 2012 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2012 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2012. Distributed under the Boost @@ -1931,8 +1931,8 @@ a few. - Original Author: 2012 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2012 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2012. Distributed under the Boost @@ -1973,8 +1973,8 @@ a few. Refactored from FindVRPN.cmake by: Juan Sebastian Casallas - FindVRPN.cmake Original Author: 2009-2010 Ryan Pavlik - + FindVRPN.cmake Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC @@ -2019,8 +2019,8 @@ a few. change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -2064,8 +2064,8 @@ a few. change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Updated for VR Juggler 3.0 by: Brandon Newendorp @@ -2085,8 +2085,8 @@ a few. If TR1 features are not built-in, we will try to use Boost to substitute for them. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -2124,8 +2124,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -2164,8 +2164,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -2209,8 +2209,8 @@ a few. change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -2254,8 +2254,8 @@ a few. change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Updated for VR Juggler 3.0 by: Brandon Newendorp @@ -2299,8 +2299,8 @@ a few. change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -2347,8 +2347,8 @@ a few. change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Updated for VR Juggler 3.0 by: Brandon Newendorp @@ -2374,8 +2374,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -2421,8 +2421,8 @@ a few. change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -2468,8 +2468,8 @@ a few. change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Updated for VR Juggler 3.0 by: Brandon Newendorp @@ -2514,8 +2514,8 @@ a few. change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -2559,8 +2559,8 @@ a few. change this environment variable, because it cannot auto-detect this change and trigger an automatic re-run. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Updated for VR Juggler 3.0 by: Brandon Newendorp @@ -2633,8 +2633,8 @@ a few. this environment variable, because it cannot auto-detect this change and trigger an automatic re-run. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Updated for VR Juggler 3.0 by: Brandon Newendorp @@ -2713,8 +2713,8 @@ a few. this environment variable, because it cannot auto-detect this change and trigger an automatic re-run. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -2792,10 +2792,10 @@ a few. this environment variable, because it cannot auto-detect this change and trigger an automatic re-run. - Original Author: 2009-2011 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2011 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Updated for VR Juggler 3.0 by: - Brandon Newendorp and Ryan Pavlik + Brandon Newendorp and Rylie Pavlik Copyright Iowa State University 2009-2011. Distributed under the Boost Software License, Version 1.0. (See accompanying file @@ -2833,8 +2833,8 @@ a few. - Original Author: 2009-2012 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2012 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2012. Distributed under the @@ -2870,8 +2870,8 @@ a few. - Original Author: 2012 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2012 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2012. Distributed under the Boost @@ -2937,8 +2937,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -2973,8 +2973,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3010,8 +3010,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3052,8 +3052,8 @@ a few. - Original Author: 2012 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2012 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2012. Distributed under the Boost @@ -3092,8 +3092,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3132,8 +3132,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3167,8 +3167,8 @@ a few. - Original Author: 2009-2011 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2011 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2011. Distributed under the @@ -3192,8 +3192,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3225,8 +3225,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3258,8 +3258,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3277,8 +3277,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3309,8 +3309,8 @@ a few. - Original Author: 2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3350,8 +3350,8 @@ a few. - Original Author: 2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3365,7 +3365,7 @@ a few. Schneider Copyright 2007 Wengo Copyright 2007 Mike Jackson Copyright 2008 Andreas Pakulat Copyright 2008-2009 Philip Lowman Copyright 2010 Iowa State - University (Ryan Pavlik ) + University (Rylie Pavlik ) Distributed under the OSI-approved BSD License (the "License"); see accompanying file Copyright.txt for details. @@ -3426,8 +3426,8 @@ a few. Requires CMake 2.6 or newer (uses the 'function' command) - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3445,8 +3445,8 @@ a few. Requires CMake 2.6 or newer (uses the 'function' command) - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3468,8 +3468,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3507,8 +3507,8 @@ a few. Requires CMake 2.6 or newer (uses the 'function' command) - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3528,8 +3528,8 @@ a few. Requires CMake 2.6 or newer (uses the 'function' command) - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3541,8 +3541,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3561,8 +3561,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3588,8 +3588,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3620,8 +3620,8 @@ a few. Requires CMake 2.6 or newer (uses the 'function' command) - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3643,8 +3643,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3666,8 +3666,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3692,8 +3692,8 @@ a few. - Original Author: 2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3709,8 +3709,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3724,8 +3724,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3745,8 +3745,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3765,8 +3765,8 @@ a few. - Original Author: 2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3795,8 +3795,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3814,8 +3814,8 @@ a few. - Original Author: 2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3834,8 +3834,8 @@ a few. Requires CMake 2.6 or newer (uses the 'function' command) - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3891,8 +3891,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3908,8 +3908,8 @@ a few. TCHAR_WORKAROUND, automatically set to on when not on win32 TCHAR_INCLUDE_DIR, location of our fake tchar.h file - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3937,8 +3937,8 @@ a few. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -3968,8 +3968,8 @@ a few. Requires CMake 2.6 or newer (uses the 'function' command) - Original Author: 2011 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2011 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2011-2012. Distributed under the @@ -3984,8 +3984,8 @@ a few. This calls include_directories and link_directories as needed to permit TR1 support. - Original Author: 2009-2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2009-2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the @@ -4001,8 +4001,8 @@ a few. - Original Author: 2010 Ryan Pavlik - http://academic.cleardefinition.com Iowa State + Original Author: 2010 Rylie Pavlik + http://academic.cleardefinition.com Iowa State University HCI Graduate Program/VRAC Copyright Iowa State University 2009-2010. Distributed under the diff --git a/cmake/nested_targets/DCubed/CMakeLists.txt b/cmake/nested_targets/DCubed/CMakeLists.txt index c25267e3c..fe18d3c34 100644 --- a/cmake/nested_targets/DCubed/CMakeLists.txt +++ b/cmake/nested_targets/DCubed/CMakeLists.txt @@ -1,14 +1,17 @@ # - Build the DCubed wrapper libraries as a part of your solution. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # Distributed under the Boost Software License, Version 1.0. -# (See accompanying file ../../LICENSE_1_0.txt or copy at +# (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +# +# SPDX-License-Identifier: BSL-1.0 include_directories("${DCUBED_CORE_INCLUDE_DIR}/d3e_inc" "${DCUBED_WRAPPER_INCLUDE_DIR}") diff --git a/cmake/nested_targets/DCubed/d3ew_p/CMakeLists.txt b/cmake/nested_targets/DCubed/d3ew_p/CMakeLists.txt index c86c52712..b805bb8c2 100644 --- a/cmake/nested_targets/DCubed/d3ew_p/CMakeLists.txt +++ b/cmake/nested_targets/DCubed/d3ew_p/CMakeLists.txt @@ -1,14 +1,17 @@ # - Build the DCubed wrapper library d3ew_p as a part of your solution. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # Distributed under the Boost Software License, Version 1.0. -# (See accompanying file ../../LICENSE_1_0.txt or copy at +# (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +# +# SPDX-License-Identifier: BSL-1.0 set(SOURCES) diff --git a/cmake/nested_targets/DCubed/d3ew_scene/CMakeLists.txt b/cmake/nested_targets/DCubed/d3ew_scene/CMakeLists.txt index 1f881b978..5aa66bef0 100644 --- a/cmake/nested_targets/DCubed/d3ew_scene/CMakeLists.txt +++ b/cmake/nested_targets/DCubed/d3ew_scene/CMakeLists.txt @@ -1,14 +1,17 @@ # - Build the DCubed wrapper library d3ew_scene as a part of your solution. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # Distributed under the Boost Software License, Version 1.0. -# (See accompanying file ../../LICENSE_1_0.txt or copy at +# (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +# +# SPDX-License-Identifier: BSL-1.0 set(SOURCES) diff --git a/cmake/nested_targets/OpenHaptics/CMakeLists.txt b/cmake/nested_targets/OpenHaptics/CMakeLists.txt index f46daa391..89ef8d273 100644 --- a/cmake/nested_targets/OpenHaptics/CMakeLists.txt +++ b/cmake/nested_targets/OpenHaptics/CMakeLists.txt @@ -1,14 +1,17 @@ # - Build the OpenHaptics utility libraries as a part of your solution. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # Distributed under the Boost Software License, Version 1.0. -# (See accompanying file ../../LICENSE_1_0.txt or copy at +# (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +# +# SPDX-License-Identifier: BSL-1.0 if(WIN32) # Work around bug in library at least <= 3.10 diff --git a/cmake/nested_targets/Parasolid/CMakeLists.txt b/cmake/nested_targets/Parasolid/CMakeLists.txt index 3dfc51e68..70084f181 100644 --- a/cmake/nested_targets/Parasolid/CMakeLists.txt +++ b/cmake/nested_targets/Parasolid/CMakeLists.txt @@ -1,14 +1,17 @@ # - Build the Parasolid utility libraries as a part of your solution. # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # Distributed under the Boost Software License, Version 1.0. -# (See accompanying file ../../LICENSE_1_0.txt or copy at +# (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +# +# SPDX-License-Identifier: BSL-1.0 if(PARASOLID_fg_LIBRARY STREQUAL "parasolid_fg_nested_target") diff --git a/cmake/nested_targets/cutil/CMakeLists.txt b/cmake/nested_targets/cutil/CMakeLists.txt index 2f2711492..56012a1b0 100644 --- a/cmake/nested_targets/cutil/CMakeLists.txt +++ b/cmake/nested_targets/cutil/CMakeLists.txt @@ -1,12 +1,15 @@ # CMake cross-platform build system -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com/ +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # 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) +# +# SPDX-License-Identifier: BSL-1.0 ### diff --git a/cmake/package-licensing/Boost.cmake b/cmake/package-licensing/Boost.cmake deleted file mode 100644 index 22e7d86ee..000000000 --- a/cmake/package-licensing/Boost.cmake +++ /dev/null @@ -1,13 +0,0 @@ -# Original Author: -# 2009-2010 Ryan Pavlik -# 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) - -add_permissive_license(Boost - "Based in part on the work of the Boost project. Boost is distributed under the Boost Software License, Version 1.0. See copy at http://www.boost.org/LICENSE_1_0.txt" - "") diff --git a/cmake/package-licensing/Eigen.cmake b/cmake/package-licensing/Eigen.cmake deleted file mode 100644 index 538d787ed..000000000 --- a/cmake/package-licensing/Eigen.cmake +++ /dev/null @@ -1,13 +0,0 @@ -# Original Author: -# 2009-2010 Ryan Pavlik -# 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) - -add_permissive_license(Eigen - "Based in part on the work of the Eigen project. Eigen is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.\nEigen is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details." - "") diff --git a/cmake/package-licensing/FLTK.cmake b/cmake/package-licensing/FLTK.cmake deleted file mode 100644 index 21d71687c..000000000 --- a/cmake/package-licensing/FLTK.cmake +++ /dev/null @@ -1,14 +0,0 @@ -# Original Author: -# 2009-2010 Ryan Pavlik -# 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) - -add_permissive_license(FLTK - "Based in part on the work of the FLTK project, available under the terms of the FLTK License (GNU Library General Public LIcense with exceptions). FLTK is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n\nFLTK is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details." - "") -add_permissive_license(FLTK "Based in part on the work of the FLTK project, available under the terms of the FLTK License (GNU Library General Public LIcense with exceptions). FLTK is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n\nFLTK is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details." "") \ No newline at end of file diff --git a/cmake/package-licensing/Lua.cmake b/cmake/package-licensing/Lua.cmake deleted file mode 100644 index b15f51b3e..000000000 --- a/cmake/package-licensing/Lua.cmake +++ /dev/null @@ -1,14 +0,0 @@ -# Original Author: -# 2009-2010 Ryan Pavlik -# 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) - -add_permissive_license(Lua - "Based in part on the work of the Lua project, Copyright 1994-2008 Lua.org, PUC-Rio. Lua is licensed under the terms of the MIT license, reproduced at http://www.lua.org/license.html#5" - "") - diff --git a/cmake/package-licensing/LuaBind.cmake b/cmake/package-licensing/LuaBind.cmake deleted file mode 100644 index 342e7a419..000000000 --- a/cmake/package-licensing/LuaBind.cmake +++ /dev/null @@ -1,15 +0,0 @@ -# Original Author: -# 2009-2010 Ryan Pavlik -# 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) - -add_permissive_license(LuaBind - "Based in part on the work of the LuaBind project. LuaBind is licensed under the terms of the MIT license, reproduced at http://www.lua.org/license.html#5" - "") - -include("package-licensing/Boost") diff --git a/cmake/package-licensing/OpenHapticsAcademicEdition.cmake b/cmake/package-licensing/OpenHapticsAcademicEdition.cmake deleted file mode 100644 index 5a06521d5..000000000 --- a/cmake/package-licensing/OpenHapticsAcademicEdition.cmake +++ /dev/null @@ -1,15 +0,0 @@ -# Original Author: -# 2009-2010 Ryan Pavlik -# 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) - -add_proprietary_license(OpenHapticsAE - "Based in part on the Sensable OpenHaptics Toolkit Academic Edition as licensed to Iowa State University. NOT FOR REDISTRIBUTION." - "") - -add_redistribution_warning("NOT FOR REDISTRIBUTION - OpenHaptics Toolkit Academic Edition licensed to Iowa State University.") diff --git a/cmake/package-licensing/OpenSceneGraph.cmake b/cmake/package-licensing/OpenSceneGraph.cmake deleted file mode 100644 index c4fa29be1..000000000 --- a/cmake/package-licensing/OpenSceneGraph.cmake +++ /dev/null @@ -1,13 +0,0 @@ -# Original Author: -# 2009-2010 Ryan Pavlik -# 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) - -add_permissive_license(OpenSceneGraph - "Based in part on the work of the OpenSceneGraph project. OpenSceneGraph is open source and may be redistributed and/or modified under the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or (at your option) any later version. The full license is on the openscenegraph.org website.\n\nOpenSceneGraph is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the OpenSceneGraph Public License for more details." - "") diff --git a/cmake/package-licensing/PhysicalModelingUtils.cmake b/cmake/package-licensing/PhysicalModelingUtils.cmake deleted file mode 100644 index edda38f0c..000000000 --- a/cmake/package-licensing/PhysicalModelingUtils.cmake +++ /dev/null @@ -1,13 +0,0 @@ -# Original Author: -# 2009-2010 Ryan Pavlik -# 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) - -add_permissive_license(PhysicalModelingUtils - "Based in part on the work of the PhysicalModelingUtils project, Copyright 2009-2010 Iowa State University. PhysicalModelingUtils is distributed under the Boost Software License, Version 1.0. See copy at http://www.boost.org/LICENSE_1_0.txt" - "") diff --git a/cmake/package-licensing/Qt-LGPL.cmake b/cmake/package-licensing/Qt-LGPL.cmake deleted file mode 100644 index db4d78d32..000000000 --- a/cmake/package-licensing/Qt-LGPL.cmake +++ /dev/null @@ -1,13 +0,0 @@ -# Original Author: -# 2009-2010 Ryan Pavlik -# 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) - -add_permissive_license(Qt - "Based in part on the work of the Qt GUI Toolkit project. The Qt GUI Toolkit is Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). You may use, distribute and copy the Qt GUI Toolkit under the terms of GNU Lesser General Public License version 2.1, as published by the Free Software Foundation." - "") diff --git a/cmake/package-licensing/VPS.cmake b/cmake/package-licensing/VPS.cmake deleted file mode 100644 index 4a2b1ca85..000000000 --- a/cmake/package-licensing/VPS.cmake +++ /dev/null @@ -1,15 +0,0 @@ -# Original Author: -# 2009-2010 Ryan Pavlik -# 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) - -add_proprietary_license(VPS - "Based in part on Voxmap PointShell(TM) software from Boeing, licensed to Iowa State University. NOT FOR REDISTRIBUTION." - "") - -add_redistribution_warning("NOT FOR REDISTRIBUTION - Voxmap PointShell(TM) software licensed only to Iowa State University.") diff --git a/cmake/package-licensing/VRJuggLua.cmake b/cmake/package-licensing/VRJuggLua.cmake deleted file mode 100644 index d2da335cc..000000000 --- a/cmake/package-licensing/VRJuggLua.cmake +++ /dev/null @@ -1,19 +0,0 @@ -# Original Author: -# 2009-2012 Ryan Pavlik -# http://academic.cleardefinition.com -# Iowa State University HCI Graduate Program/VRAC -# -# Copyright Iowa State University 2009-2012. -# 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) - -add_permissive_license("VR JuggLua" - "Based in part on VR JuggLua, Copyright 2010-2012 Iowa State University. VR JuggLua is distributed under the Boost Software License, Version 1.0. See copy at http://www.boost.org/LICENSE_1_0.txt" - "") -include("package-licensing/VRJuggler") -include("package-licensing/OpenSceneGraph") -include("package-licensing/Lua") -include("package-licensing/LuaBind") -include("package-licensing/osgLua") -include("package-licensing/Boost") diff --git a/cmake/package-licensing/VRJuggler.cmake b/cmake/package-licensing/VRJuggler.cmake deleted file mode 100644 index f015ef351..000000000 --- a/cmake/package-licensing/VRJuggler.cmake +++ /dev/null @@ -1,15 +0,0 @@ -# Original Author: -# 2009-2010 Ryan Pavlik -# 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) - -add_permissive_license("VR Juggler" - "Based in part on the work of the VR Juggler project. VR Juggler is Copyright 1998-2010 Iowa State University. VR Juggler is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n\nVR Juggler is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details." - "") - -include("package-licensing/Boost") diff --git a/cmake/package-licensing/VirtuoseAPI.cmake b/cmake/package-licensing/VirtuoseAPI.cmake deleted file mode 100644 index fe7d5c653..000000000 --- a/cmake/package-licensing/VirtuoseAPI.cmake +++ /dev/null @@ -1,14 +0,0 @@ -# Original Author: -# 2009-2010 Ryan Pavlik -# 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) - -add_proprietary_license(VirtuoseAPI - "Based in part on the Haption VirtuoseAPI." - "") -add_redistribution_warning("Redistribution of the VirtuoseAPI may be restricted.") diff --git a/cmake/package-licensing/osgLua.cmake b/cmake/package-licensing/osgLua.cmake deleted file mode 100644 index 04780e130..000000000 --- a/cmake/package-licensing/osgLua.cmake +++ /dev/null @@ -1,16 +0,0 @@ -# Original Author: -# 2009-2010 Ryan Pavlik -# 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) - -add_permissive_license(osgLua - "Based in part on the work of the osgLua project. osgLua is open source and may be redistributed and/or modified under the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or (at your option) any later version. The full license is on the openscenegraph.org website.\n\nosgLua is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the OpenSceneGraph Public License for more details." - "") - -include("package-licensing/OpenSceneGraph") -include("package-licensing/Lua") diff --git a/cmake/package/fixupbundle.cmake.in b/cmake/package/fixupbundle.cmake.in index 1936f380b..4e69dc23a 100644 --- a/cmake/package/fixupbundle.cmake.in +++ b/cmake/package/fixupbundle.cmake.in @@ -1,14 +1,17 @@ # - Configurable script to fix up a VR Juggler bundle # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# 2009-2010 Rylie Pavlik +# https://ryliepavlik.com/ # Iowa State University HCI Graduate Program/VRAC # -# Copyright Iowa State University 2009-2010. +# Copyright 2009-2010, Iowa State University +# # Distributed under the Boost Software License, Version 1.0. -# (See accompanying file ../../LICENSE_1_0.txt or copy at +# (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +# +# SPDX-License-Identifier: BSL-1.0 function(gp_resolve_item_override _context _item _exepath _dirs _resolved_item _resolved) if(NOT ${_resolved}) @@ -53,4 +56,4 @@ foreach(lib ${BUNDLE_LIBS_INPUT}) endif() endforeach() -fixup_bundle("${CMAKE_INSTALL_PREFIX}/${APP}" "${BUNDLE_LIBS}" "@BUNDLE_LIB_DIRS@") \ No newline at end of file +fixup_bundle("${CMAKE_INSTALL_PREFIX}/${APP}" "${BUNDLE_LIBS}" "@BUNDLE_LIB_DIRS@") diff --git a/cmake/workarounds/mac-alut-framework/AL/alut.h b/cmake/workarounds/mac-alut-framework/AL/alut.h index 8e5b93925..c2cb0ef8c 100644 --- a/cmake/workarounds/mac-alut-framework/AL/alut.h +++ b/cmake/workarounds/mac-alut-framework/AL/alut.h @@ -1 +1,4 @@ +// Copyright 2010, Iowa State University +// SPDX-License-Identifier: BSL-1.0 + #include diff --git a/cmake/workarounds/mac-gl/GL/gl.h b/cmake/workarounds/mac-gl/GL/gl.h index 1cbb3cd93..7ea7938a5 100644 --- a/cmake/workarounds/mac-gl/GL/gl.h +++ b/cmake/workarounds/mac-gl/GL/gl.h @@ -1 +1,4 @@ +// Copyright 2010, Iowa State University +// SPDX-License-Identifier: BSL-1.0 + #include diff --git a/cmake/workarounds/mac-gl/GL/glui.h b/cmake/workarounds/mac-gl/GL/glui.h index f6a993a2f..088fabe68 100644 --- a/cmake/workarounds/mac-gl/GL/glui.h +++ b/cmake/workarounds/mac-gl/GL/glui.h @@ -1 +1,4 @@ +// Copyright 2010, Iowa State University +// SPDX-License-Identifier: BSL-1.0 + #include diff --git a/cmake/workarounds/mac-gl/GL/glut.h b/cmake/workarounds/mac-gl/GL/glut.h index d3182a29d..9c0ea1d5c 100644 --- a/cmake/workarounds/mac-gl/GL/glut.h +++ b/cmake/workarounds/mac-gl/GL/glut.h @@ -1 +1,4 @@ +// Copyright 2010, Iowa State University +// SPDX-License-Identifier: BSL-1.0 + #include diff --git a/cmake/workarounds/mac-openal/AL/al.h b/cmake/workarounds/mac-openal/AL/al.h index b032a6360..d18ab5a16 100644 --- a/cmake/workarounds/mac-openal/AL/al.h +++ b/cmake/workarounds/mac-openal/AL/al.h @@ -1 +1,4 @@ +// Copyright 2010, Iowa State University +// SPDX-License-Identifier: BSL-1.0 + #include diff --git a/cmake/workarounds/mac-openal/AL/alc.h b/cmake/workarounds/mac-openal/AL/alc.h index 8ddbddcc5..28e07e30c 100644 --- a/cmake/workarounds/mac-openal/AL/alc.h +++ b/cmake/workarounds/mac-openal/AL/alc.h @@ -1 +1,4 @@ +// Copyright 2010, Iowa State University +// SPDX-License-Identifier: BSL-1.0 + #include diff --git a/cmake/workarounds/tchar/tchar.h b/cmake/workarounds/tchar/tchar.h index aff036b8d..2de56274e 100644 --- a/cmake/workarounds/tchar/tchar.h +++ b/cmake/workarounds/tchar/tchar.h @@ -1,2 +1,5 @@ +// Copyright 2010, Iowa State University +// SPDX-License-Identifier: BSL-1.0 + #define _tmain main -#define _TCHAR char \ No newline at end of file +#define _TCHAR char From 52fb6bb3bbda6666ba6bc92fdf7ececa928265a9 Mon Sep 17 00:00:00 2001 From: Rylie Pavlik Date: Thu, 3 Sep 2026 10:14:20 -0500 Subject: [PATCH 2/3] Add mailmap --- .mailmap | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 000000000..50b0aa908 --- /dev/null +++ b/.mailmap @@ -0,0 +1,34 @@ +# SPDX-FileCopyrightText: 2023-2026, Rylie Pavlik +# SPDX-License-Identifier: CC0-1.0 + +Chelsea Jaggi + +Christoph Haag +Christoph Haag + +Georgiy Frolov +Georgiy Frolov +Georgiy Frolov + +Greg Aring +Greg Aring +Greg Aring + +JeroMiya + +Kevin M. Godby +Kevin M. Godby + +Russ Taylor +Russ Taylor +Russ Taylor + +Rylie Pavlik +Rylie Pavlik +Rylie Pavlik +Rylie Pavlik +Rylie Pavlik + +Yuval Boger +Yuval Boger +Yuval Boger From 4499b28ebd394cc10b097720a4cbb06c69939487 Mon Sep 17 00:00:00 2001 From: Rylie Pavlik Date: Thu, 3 Sep 2026 09:59:00 -0500 Subject: [PATCH 3/3] Fix name outside of CMake dir --- .../device-descriptors/Futaba_InterLink_Elite.json | 2 +- examples/clients/selfcontained/CMakeLists.txt | 4 ++-- examples/plugin/com_osvr_example_AnalogSync.json | 2 +- examples/plugin/com_osvr_example_Configured.json | 2 +- .../plugin/org_osvr_example_SampleCPlugin.json | 2 +- examples/plugin/selfcontained/CMakeLists.txt | 6 +++--- .../com_osvr_example_selfcontained.json | 2 +- inc/osvr/Util/Finally.h | 2 +- .../com_osvr_Multiserver_OSVRHackerDevKit.json | 2 +- .../com_osvr_Multiserver_OneEuroFilter.json | 2 +- .../com_osvr_Multiserver_RazerHydra.json | 2 +- .../com_osvr_Multiserver_YEI_3Space_Sensor.json | 2 +- plugins/oneeurofilter/org_osvr_filter_oneeuro.json | 2 +- plugins/opencv/com_osvr_VideoCapture_OpenCV.json | 2 +- .../ParameterFinder/newuoa.h | 2 +- .../org_osvr_unifiedvideoinertial.json | 2 +- plugins/videobasedtracker/VideoBasedTracker.h | 2 +- .../videobasedtracker/math/reprojectjacobian.wxm | 14 +++++++------- .../org_osvr_filter_videoimufusion.json | 2 +- tests/cplusplus/CatchMain.cpp | 2 +- tests/cplusplus/Util/CatchEigen.h | 2 +- vendor/FloatExceptions/README.md | 2 +- vendor/util-headers/util/RunLoopManager.h | 6 +++--- vendor/util-headers/util/RunLoopManagerBoost.h | 6 +++--- vendor/util-headers/util/Stride.h | 6 +++--- 25 files changed, 40 insertions(+), 40 deletions(-) diff --git a/apps/external-devices/device-descriptors/Futaba_InterLink_Elite.json b/apps/external-devices/device-descriptors/Futaba_InterLink_Elite.json index df98757c5..703a853be 100644 --- a/apps/external-devices/device-descriptors/Futaba_InterLink_Elite.json +++ b/apps/external-devices/device-descriptors/Futaba_InterLink_Elite.json @@ -1,7 +1,7 @@ { "deviceVendor": "Futaba", "deviceName": "InterLink Elite Controller", - "author": "Ryan Pavlik ", + "author": "Rylie Pavlik ", "version": 1, "lastModified": "2015-11-20T17:40:24.732Z", "interfaces": { diff --git a/examples/clients/selfcontained/CMakeLists.txt b/examples/clients/selfcontained/CMakeLists.txt index dab1cf52e..26a2f55ce 100644 --- a/examples/clients/selfcontained/CMakeLists.txt +++ b/examples/clients/selfcontained/CMakeLists.txt @@ -3,8 +3,8 @@ project(SampleClient) # Change this line. # This looks for an osvrConfig.cmake file - most of the time it can be # autodetected but you might need to specify osvr_DIR to be something like -# C:/Users/Ryan/Desktop/build/OSVR-Core-vc12 or -# C:/Users/Ryan/Downloads/OSVR-Core-Snapshot-v0.1-406-gaa55515-build54-vs12-32bit +# C:/Users/Rylie/Desktop/build/OSVR-Core-vc12 or +# C:/Users/Rylie/Downloads/OSVR-Core-Snapshot-v0.1-406-gaa55515-build54-vs12-32bit # in the CMake GUI or command line find_package(osvr) diff --git a/examples/plugin/com_osvr_example_AnalogSync.json b/examples/plugin/com_osvr_example_AnalogSync.json index 7308b05ca..353104837 100644 --- a/examples/plugin/com_osvr_example_AnalogSync.json +++ b/examples/plugin/com_osvr_example_AnalogSync.json @@ -1,7 +1,7 @@ { "deviceVendor": "OSVR", "deviceName": "Analog Data Sync Plugin Example", - "author": "Ryan Pavlik ", + "author": "Rylie Pavlik ", "version": 1, "lastModified": "2015-01-30T21:13:07.585Z", "interfaces": { diff --git a/examples/plugin/com_osvr_example_Configured.json b/examples/plugin/com_osvr_example_Configured.json index 94490a26f..bed77ca51 100644 --- a/examples/plugin/com_osvr_example_Configured.json +++ b/examples/plugin/com_osvr_example_Configured.json @@ -1,7 +1,7 @@ { "deviceVendor": "OSVR", "deviceName": "Configured Plugin Example", - "author": "Ryan Pavlik ", + "author": "Rylie Pavlik ", "version": 1, "lastModified": "2015-09-03T22:58:24.431Z", "interfaces": { diff --git a/examples/plugin/org_osvr_example_SampleCPlugin.json b/examples/plugin/org_osvr_example_SampleCPlugin.json index 989588354..56a1aaafc 100644 --- a/examples/plugin/org_osvr_example_SampleCPlugin.json +++ b/examples/plugin/org_osvr_example_SampleCPlugin.json @@ -1,7 +1,7 @@ { "deviceVendor": "Sensics", "deviceName": "Sample C Plugin", - "author": "Ryan Pavlik ", + "author": "Rylie Pavlik ", "version": 1, "lastModified": "2015-11-12T23:00:24.431Z", "interfaces": { diff --git a/examples/plugin/selfcontained/CMakeLists.txt b/examples/plugin/selfcontained/CMakeLists.txt index 7f21ba3e7..0089a3d7b 100644 --- a/examples/plugin/selfcontained/CMakeLists.txt +++ b/examples/plugin/selfcontained/CMakeLists.txt @@ -3,8 +3,8 @@ project(SampleExternalPlugin) # Change this line. # This looks for an osvrConfig.cmake file - most of the time it can be # autodetected but you might need to create/extend CMAKE_PREFIX_PATH to include something like -# C:/Users/Ryan/Desktop/build/OSVR-Core-vc12 or -# C:/Users/Ryan/Downloads/OSVR-Core-Snapshot-v0.1-406-gaa55515-build54-vs12-32bit +# C:/Users/Rylie/Desktop/build/OSVR-Core-vc12 or +# C:/Users/Rylie/Downloads/OSVR-Core-Snapshot-v0.1-406-gaa55515-build54-vs12-32bit # in the CMake GUI or command line. find_package(osvr REQUIRED) @@ -29,4 +29,4 @@ osvr_add_plugin(NAME com_osvr_example_selfcontained "${CMAKE_CURRENT_BINARY_DIR}/com_osvr_example_selfcontained_json.h") # If you use other libraries, find them and add a line like: -# target_link_libraries(com_osvr_example_selfcontained AnyOtherLibraries) \ No newline at end of file +# target_link_libraries(com_osvr_example_selfcontained AnyOtherLibraries) diff --git a/examples/plugin/selfcontained/com_osvr_example_selfcontained.json b/examples/plugin/selfcontained/com_osvr_example_selfcontained.json index 768355c4d..d128b230c 100644 --- a/examples/plugin/selfcontained/com_osvr_example_selfcontained.json +++ b/examples/plugin/selfcontained/com_osvr_example_selfcontained.json @@ -1,7 +1,7 @@ { "deviceVendor": "OSVR", "deviceName": "Comprehensive Plugin Example", - "author": "Ryan Pavlik ", + "author": "Rylie Pavlik ", "version": 1, "lastModified": "2015-01-30T21:13:07.585Z", "interfaces": { diff --git a/inc/osvr/Util/Finally.h b/inc/osvr/Util/Finally.h index fa3481340..7e280970b 100644 --- a/inc/osvr/Util/Finally.h +++ b/inc/osvr/Util/Finally.h @@ -8,7 +8,7 @@ since its introduction into the C++ global consciousness, and this implementation was written independently after I couldn't find a previous independent implementation I had written a few weeks earlier in - an implementation file. -- Ryan Pavlik + an implementation file. -- Rylie Pavlik @date 2016 diff --git a/plugins/multiserver/com_osvr_Multiserver_OSVRHackerDevKit.json b/plugins/multiserver/com_osvr_Multiserver_OSVRHackerDevKit.json index 3aac47c4e..1575610d5 100644 --- a/plugins/multiserver/com_osvr_Multiserver_OSVRHackerDevKit.json +++ b/plugins/multiserver/com_osvr_Multiserver_OSVRHackerDevKit.json @@ -1,7 +1,7 @@ { "deviceVendor": "OSVR", "deviceName": "Hacker Development Kit (HDK) Integrated IMU Tracker", - "author": "Ryan Pavlik ", + "author": "Rylie Pavlik ", "version": 3, "lastModified": "2015-11-05T20:44:16+00:00", "interfaces": { diff --git a/plugins/multiserver/com_osvr_Multiserver_OneEuroFilter.json b/plugins/multiserver/com_osvr_Multiserver_OneEuroFilter.json index 315fac5a8..7ac6acef9 100644 --- a/plugins/multiserver/com_osvr_Multiserver_OneEuroFilter.json +++ b/plugins/multiserver/com_osvr_Multiserver_OneEuroFilter.json @@ -1,7 +1,7 @@ { "deviceVendor": "OSVR/VRPN", "deviceName": "'One Euro' Tracking Filter", - "author": "Ryan Pavlik ", + "author": "Rylie Pavlik ", "version": 1, "lastModified": "2015-04-10T17:42:17.563Z", "interfaces": { diff --git a/plugins/multiserver/com_osvr_Multiserver_RazerHydra.json b/plugins/multiserver/com_osvr_Multiserver_RazerHydra.json index 54c8b8df9..6ffaa8db2 100644 --- a/plugins/multiserver/com_osvr_Multiserver_RazerHydra.json +++ b/plugins/multiserver/com_osvr_Multiserver_RazerHydra.json @@ -1,7 +1,7 @@ { "deviceVendor": "Razer", "deviceName": "Hydra motion controller", - "author": "Ryan Pavlik ", + "author": "Rylie Pavlik ", "version": 2, "lastModified": "2015-04-10T17:38:49.659Z", "interfaces": { diff --git a/plugins/multiserver/com_osvr_Multiserver_YEI_3Space_Sensor.json b/plugins/multiserver/com_osvr_Multiserver_YEI_3Space_Sensor.json index f5e090dcd..8181752bf 100644 --- a/plugins/multiserver/com_osvr_Multiserver_YEI_3Space_Sensor.json +++ b/plugins/multiserver/com_osvr_Multiserver_YEI_3Space_Sensor.json @@ -1,7 +1,7 @@ { "deviceVendor": "YEI", "deviceName": "3Space Sensor", - "author": "Ryan Pavlik ", + "author": "Rylie Pavlik ", "version": 1, "lastModified": "2014-12-04T21:13:07.585Z", "interfaces": { diff --git a/plugins/oneeurofilter/org_osvr_filter_oneeuro.json b/plugins/oneeurofilter/org_osvr_filter_oneeuro.json index c62fcdefb..8ee688e05 100644 --- a/plugins/oneeurofilter/org_osvr_filter_oneeuro.json +++ b/plugins/oneeurofilter/org_osvr_filter_oneeuro.json @@ -1,7 +1,7 @@ { "deviceVendor": "OSVR", "deviceName": "'One Euro' Tracking Filter", - "author": "Ryan Pavlik ", + "author": "Rylie Pavlik ", "version": 1, "lastModified": "2015-10-12T21:13:07.585Z", "interfaces": { diff --git a/plugins/opencv/com_osvr_VideoCapture_OpenCV.json b/plugins/opencv/com_osvr_VideoCapture_OpenCV.json index 252dac1d5..6118452cb 100644 --- a/plugins/opencv/com_osvr_VideoCapture_OpenCV.json +++ b/plugins/opencv/com_osvr_VideoCapture_OpenCV.json @@ -1,7 +1,7 @@ { "deviceVendor": "Generic", "deviceName": "OpenCV Video Capture", - "author": "Ryan Pavlik ", + "author": "Rylie Pavlik ", "version": 1, "lastModified": "2015-05-21T18:41:56.009Z", "interfaces": { diff --git a/plugins/unifiedvideoinertialtracker/ParameterFinder/newuoa.h b/plugins/unifiedvideoinertialtracker/ParameterFinder/newuoa.h index 1ec1023e7..9fa8163c8 100644 --- a/plugins/unifiedvideoinertialtracker/ParameterFinder/newuoa.h +++ b/plugins/unifiedvideoinertialtracker/ParameterFinder/newuoa.h @@ -25,7 +25,7 @@ derivatives", which is available at www.damtp.cam.ac.uk, for more information. Updated version from https://github.com/elsid/newuoa-cpp - further updated by - Ryan Pavlik. + Rylie Pavlik. */ /* The original fortran codes are distributed without restrictions. The diff --git a/plugins/unifiedvideoinertialtracker/org_osvr_unifiedvideoinertial.json b/plugins/unifiedvideoinertialtracker/org_osvr_unifiedvideoinertial.json index 537fd149c..b69e4a3c8 100644 --- a/plugins/unifiedvideoinertialtracker/org_osvr_unifiedvideoinertial.json +++ b/plugins/unifiedvideoinertialtracker/org_osvr_unifiedvideoinertial.json @@ -1,7 +1,7 @@ { "deviceVendor": "OSVR", "deviceName": "Unified Video-Based and Inertial Tracker", - "author": "Ryan Pavlik ", + "author": "Rylie Pavlik ", "version": 2, "lastModified": "2016-06-30T13:58:45.079Z", "interfaces": { diff --git a/plugins/videobasedtracker/VideoBasedTracker.h b/plugins/videobasedtracker/VideoBasedTracker.h index 796d6049b..f3b2b5dd1 100644 --- a/plugins/videobasedtracker/VideoBasedTracker.h +++ b/plugins/videobasedtracker/VideoBasedTracker.h @@ -175,7 +175,7 @@ namespace vbtracker { SBDBlobExtractor m_blobExtractor; cv::SimpleBlobDetector::Params m_sbdParams; - /// @brief Test (with asserts) what Ryan thinks are the invariants. Will + /// @brief Test (with asserts) what Rylie thinks are the invariants. Will /// inline right out of existence in non-debug builds. void m_assertInvariants() const { BOOST_ASSERT_MSG( diff --git a/plugins/videobasedtracker/math/reprojectjacobian.wxm b/plugins/videobasedtracker/math/reprojectjacobian.wxm index 4ac856b2e..39f3e124f 100644 --- a/plugins/videobasedtracker/math/reprojectjacobian.wxm +++ b/plugins/videobasedtracker/math/reprojectjacobian.wxm @@ -6,7 +6,7 @@ Startup Functionality [wxMaxima: section end ] */ /* [wxMaxima: input start ] */ -file_search_maxima : cons(sconcat("C:/Users/Ryan/Desktop/src/OSVR-Core/plugins/videobasedtracker/math/###.{lisp,mac,mc}"), file_search_maxima)$ +file_search_maxima : cons(sconcat("C:/Users/Rylie/Desktop/src/OSVR-Core/plugins/videobasedtracker/math/###.{lisp,mac,mc}"), file_search_maxima)$ /* [wxMaxima: input end ] */ /* [wxMaxima: input start ] */ @@ -22,7 +22,7 @@ This is the "simple" version without distortion in it. [wxMaxima: comment end ] */ /* [wxMaxima: input start ] */ -projectPointRotMatrix(rot, translation, objPt, fl, c) := +projectPointRotMatrix(rot, translation, objPt, fl, c) := block([xformed], xformed : rot . transpose(objPt) + transpose(translation), print(xformed), @@ -43,7 +43,7 @@ right now only handling up through k3, k4-k6 go on the bottom instead... [wxMaxima: comment end ] */ /* [wxMaxima: input start ] */ -projectDistortedPoint(quat, translation, objPt, fx, fy, cx, cy, k, p) := +projectDistortedPoint(quat, translation, objPt, fx, fy, cx, cy, k, p) := block([xformed, xp, yp, r2, radDistort, xpp, ypp, x, y, z, u, v], xformed : quatToRotMatrix(quat) . objPt + translation, xp : (xformed[1]/xformed[3])[1], @@ -67,7 +67,7 @@ Comparing /* [wxMaxima: fold start ] */ /* [wxMaxima: input start ] */ -distortionDifference(quat, translation, fx, fy, cx, cy, k, p) := +distortionDifference(quat, translation, fx, fy, cx, cy, k, p) := buildq([quat, translation, fx, fy, cx, cy, k, p], projectDistortedPoint(quat, translation, point, fx, fy, cx, cy, k, p) - projectPoint(quat, translation, point, fx, fy, cx, cy)); /* [wxMaxima: input end ] */ @@ -77,8 +77,8 @@ distortionDifference([1,0,0,0], [0,0,0], 452.9, 452.9, 320, 240, [1.252916e-06, /* [wxMaxima: input end ] */ /* [wxMaxima: input start ] */ -distortionDifference(quat, translation, fx, fy, cx, cy, k, p) := -buildq([quat, translation, fx, fy, cx, cy, k, p],lambda([point], +distortionDifference(quat, translation, fx, fy, cx, cy, k, p) := +buildq([quat, translation, fx, fy, cx, cy, k, p],lambda([point], projectDistortedPoint(quat, translation, point, fx, fy, cx, cy, k, p) - projectPoint(quat, translation, point, fx, fy, cx, cy))); distortionDifference([1,0,0,0], [0,0,0], 452.9, 452.9, 320, 240, [1.252916e-06, -1.752020e-11, 6.405327e-17], [0, 0]); /* [wxMaxima: input end ] */ @@ -260,7 +260,7 @@ m_rotatedObjPoint[1] * zRecip * fl]) /* [wxMaxima: input start ] */ block([rotXlated, m_rotatedObjPoint, pos, zRecip, zSqRecip, fl, m_rotatedObjPoint, myMat], - + myMat: (zRecip * fl) * matrix( [-rotXlated[1]*m_rotatedObjPoint[2]*zRecip ,m_rotatedObjPoint[1]*rotXlated[1]*zRecip+m_rotatedObjPoint[3],-m_rotatedObjPoint[2]], diff --git a/plugins/videoimufusion/org_osvr_filter_videoimufusion.json b/plugins/videoimufusion/org_osvr_filter_videoimufusion.json index 6a702f17a..5d521eb5a 100644 --- a/plugins/videoimufusion/org_osvr_filter_videoimufusion.json +++ b/plugins/videoimufusion/org_osvr_filter_videoimufusion.json @@ -1,7 +1,7 @@ { "deviceVendor": "OSVR", "deviceName": "IMU and Video Tracking Fusion Filter", - "author": "Ryan Pavlik ", + "author": "Rylie Pavlik ", "version": 2, "lastModified": "2016-03-31T18:27:14.223Z", "interfaces": { diff --git a/tests/cplusplus/CatchMain.cpp b/tests/cplusplus/CatchMain.cpp index 0e96acbc7..d21e1e2b6 100644 --- a/tests/cplusplus/CatchMain.cpp +++ b/tests/cplusplus/CatchMain.cpp @@ -3,7 +3,7 @@ @date 2019 - @author Ryan Pavlik + @author Rylie Pavlik */ diff --git a/tests/cplusplus/Util/CatchEigen.h b/tests/cplusplus/Util/CatchEigen.h index 81a60877d..f651e536a 100644 --- a/tests/cplusplus/Util/CatchEigen.h +++ b/tests/cplusplus/Util/CatchEigen.h @@ -3,7 +3,7 @@ @date 2019 - @author Ryan Pavlik + @author Rylie Pavlik Based in part on catch_approx.h from the Catch2 distribution */ diff --git a/vendor/FloatExceptions/README.md b/vendor/FloatExceptions/README.md index fff060411..7cdc19897 100644 --- a/vendor/FloatExceptions/README.md +++ b/vendor/FloatExceptions/README.md @@ -20,4 +20,4 @@ The following additional files are excerpts of `FloatExceptions.cpp`, with tidy - `FPExceptionEnabler.h` -Ryan Pavlik, Sensics, Inc. - October 27, 2015 +Rylie Pavlik, Sensics, Inc. - October 27, 2015 diff --git a/vendor/util-headers/util/RunLoopManager.h b/vendor/util-headers/util/RunLoopManager.h index 059adc189..64d8cfbc9 100644 --- a/vendor/util-headers/util/RunLoopManager.h +++ b/vendor/util-headers/util/RunLoopManager.h @@ -14,9 +14,9 @@ @date 2013 @author - Ryan Pavlik - and - http://academic.cleardefinition.com/ + Rylie Pavlik + + https://ryliepavlik.com/ Iowa State University Virtual Reality Applications Center Human-Computer Interaction Graduate Program diff --git a/vendor/util-headers/util/RunLoopManagerBoost.h b/vendor/util-headers/util/RunLoopManagerBoost.h index 06d802777..6c2f395d0 100644 --- a/vendor/util-headers/util/RunLoopManagerBoost.h +++ b/vendor/util-headers/util/RunLoopManagerBoost.h @@ -14,9 +14,9 @@ @date 2013 @author - Ryan Pavlik - and - http://academic.cleardefinition.com/ + Rylie Pavlik + + https://ryliepavlik.com/ Iowa State University Virtual Reality Applications Center Human-Computer Interaction Graduate Program diff --git a/vendor/util-headers/util/Stride.h b/vendor/util-headers/util/Stride.h index 80a1997c5..575b93d77 100644 --- a/vendor/util-headers/util/Stride.h +++ b/vendor/util-headers/util/Stride.h @@ -15,9 +15,9 @@ 2009-2010 @author - Ryan Pavlik - and - http://academic.cleardefinition.com/ + Rylie Pavlik + + https://ryliepavlik.com/ Iowa State University Virtual Reality Applications Center Human-Computer Interaction Graduate Program */