|
From: <pat...@us...> - 2012-07-04 20:36:09
|
Revision: 693
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=693&view=rev
Author: patrickh
Date: 2012-07-04 20:35:57 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
MFT [r690]: Add the CMake build developed by Ryan Pavlik.
Revision Links:
--------------
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=690&view=rev
Modified Paths:
--------------
branches/1.2/ChangeLog
Added Paths:
-----------
branches/1.2/CMakeLists.txt
branches/1.2/cmake/
branches/1.2/cmake/AboutTheseModules.cmake
branches/1.2/cmake/BoostTestTargets.cmake
branches/1.2/cmake/BoostTestTargetsDynamic.h
branches/1.2/cmake/BoostTestTargetsIncluded.h
branches/1.2/cmake/BoostTestTargetsStatic.h
branches/1.2/cmake/BundleOSGPlugins.cmake
branches/1.2/cmake/BundleOSGRuntime.cmake
branches/1.2/cmake/BundleVRJ22Runtime.cmake
branches/1.2/cmake/BundleVRJ30Runtime.cmake
branches/1.2/cmake/CheckMacHIDAPI.cmake
branches/1.2/cmake/CheckMacHIDAPI.cpp
branches/1.2/cmake/CheckVersion.cmake
branches/1.2/cmake/CleanDirectoryList.cmake
branches/1.2/cmake/CleanLibraryList.cmake
branches/1.2/cmake/CopyResourcesToBuildTree.cmake
branches/1.2/cmake/CppcheckTargets.cmake
branches/1.2/cmake/CreateDashboardScripts.cmake
branches/1.2/cmake/CreateImportedTarget.cmake
branches/1.2/cmake/CreateLaunchers.cmake
branches/1.2/cmake/DashboardScript.cmake.in
branches/1.2/cmake/DoxygenTargets.cmake
branches/1.2/cmake/DoxygenTargets.doxyfile.in
branches/1.2/cmake/EnableExtraCompilerWarnings.cmake
branches/1.2/cmake/EnableProfiling.cmake
branches/1.2/cmake/FileCopyTargets.cmake
branches/1.2/cmake/FindALUT.cmake
branches/1.2/cmake/FindBluez.cmake
branches/1.2/cmake/FindCPPDOM.cmake
branches/1.2/cmake/FindDCubed.cmake
branches/1.2/cmake/FindFlagpoll.cmake
branches/1.2/cmake/FindGDB.cmake
branches/1.2/cmake/FindGHOST.cmake
branches/1.2/cmake/FindGLUI.cmake
branches/1.2/cmake/FindGLUT.cmake
branches/1.2/cmake/FindGMTL.cmake
branches/1.2/cmake/FindGPM.cmake
branches/1.2/cmake/FindGadgeteer12.cmake
branches/1.2/cmake/FindGadgeteer20.cmake
branches/1.2/cmake/FindGlove5DT.cmake
branches/1.2/cmake/FindHIDAPI.cmake
branches/1.2/cmake/FindJCCL12.cmake
branches/1.2/cmake/FindJCCL14.cmake
branches/1.2/cmake/FindJtTk.cmake
branches/1.2/cmake/FindJtTk.stampkey.cmake.in
branches/1.2/cmake/FindLAPACKLibs.cmake
branches/1.2/cmake/FindLibusb1.cmake
branches/1.2/cmake/FindLuabind.cmake
branches/1.2/cmake/FindLyX.cmake
branches/1.2/cmake/FindMacHID.cmake
branches/1.2/cmake/FindOpenCV.cmake
branches/1.2/cmake/FindOpenHaptics.cmake
branches/1.2/cmake/FindOpenHaptics.cpp
branches/1.2/cmake/FindParasolid.cmake
branches/1.2/cmake/FindSonix12.cmake
branches/1.2/cmake/FindSonix14.cmake
branches/1.2/cmake/FindTR1.cmake
branches/1.2/cmake/FindTooN.cmake
branches/1.2/cmake/FindTooNtag.cmake
branches/1.2/cmake/FindTweek12.cmake
branches/1.2/cmake/FindTweek14.cmake
branches/1.2/cmake/FindVPR20.cmake
branches/1.2/cmake/FindVPR22.cmake
branches/1.2/cmake/FindVPS.cmake
branches/1.2/cmake/FindVRJ22.cmake
branches/1.2/cmake/FindVRJ30.cmake
branches/1.2/cmake/FindVRJOGL22.cmake
branches/1.2/cmake/FindVRJOGL30.cmake
branches/1.2/cmake/FindVRJuggler.cmake
branches/1.2/cmake/FindVRJuggler22.cmake
branches/1.2/cmake/FindVRJuggler30.cmake
branches/1.2/cmake/FindVRPN.cmake
branches/1.2/cmake/FindVirtuoseAPI.cmake
branches/1.2/cmake/FindVirtuoseVPP.cmake
branches/1.2/cmake/FindWiiSCAAT.cmake
branches/1.2/cmake/FindWiiUse.cmake
branches/1.2/cmake/FindWinHID.cmake
branches/1.2/cmake/Findargp.cmake
branches/1.2/cmake/Findcppcheck.cmake
branches/1.2/cmake/Findcppcheck.cpp
branches/1.2/cmake/Findcppunit.cmake
branches/1.2/cmake/Findcutil.cmake
branches/1.2/cmake/Finddb2pdf.cmake
branches/1.2/cmake/FindosgLua.cmake
branches/1.2/cmake/Findquatlib.cmake
branches/1.2/cmake/GetCPUDetails.cmake
branches/1.2/cmake/GetCompilerInfoString.cmake
branches/1.2/cmake/GetDirectoryList.cmake
branches/1.2/cmake/GetFileList.cmake
branches/1.2/cmake/GetForceIncludeDefinitions.cmake
branches/1.2/cmake/GetGitRevisionDescription.cmake
branches/1.2/cmake/GetGitRevisionDescription.cmake.in
branches/1.2/cmake/GetSubprojectStatus.cmake
branches/1.2/cmake/LICENSE_1_0.txt
branches/1.2/cmake/Licensing.cmake
branches/1.2/cmake/ListCombinations.cmake
branches/1.2/cmake/ListFilter.cmake
branches/1.2/cmake/LuaTargets.cmake
branches/1.2/cmake/MSVCMultipleProcessCompile.cmake
branches/1.2/cmake/MSVCStaticRuntime.cmake
branches/1.2/cmake/MSVCVerboseLinking.cmake
branches/1.2/cmake/MakeVRJugglerAppBundle.cmake
branches/1.2/cmake/MakeVRJugglerAppBundle30.cmake
branches/1.2/cmake/OptionRequires.cmake
branches/1.2/cmake/PrefixListGlob.cmake
branches/1.2/cmake/ProgramFilesGlob.cmake
branches/1.2/cmake/README.markdown
branches/1.2/cmake/ResetConfigurations.cmake
branches/1.2/cmake/SearchProgramFilesForOpenSceneGraph.cmake
branches/1.2/cmake/SetDefaultBuildType.cmake
branches/1.2/cmake/SplitLibraryList.cmake
branches/1.2/cmake/StampSourcesWithVersion.cmake
branches/1.2/cmake/StampSourcesWithVersion.sed.in
branches/1.2/cmake/TCHARWorkaround.cmake
branches/1.2/cmake/UseBackportedModules.cmake
branches/1.2/cmake/UseTR1.cmake
branches/1.2/cmake/WarningDev.cmake
branches/1.2/cmake/cmake-2.8.0-modules/
branches/1.2/cmake/cmake-2.8.0-modules/features/
branches/1.2/cmake/cmake-2.8.0-modules/features/SelectLibraryConfigurations.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindOpenSceneGraph.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindOpenThreads.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/Findosg.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgAnimation.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgDB.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgFX.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgGA.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgIntrospection.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgManipulator.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgParticle.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgProducer.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgShadow.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgSim.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgTerrain.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgText.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgUtil.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgViewer.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgVolume.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgWidget.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/Findosg_functions.cmake
branches/1.2/cmake/cmake-2.8.1-modules/
branches/1.2/cmake/cmake-2.8.1-modules/patchctestbug10149/
branches/1.2/cmake/cmake-2.8.1-modules/patchctestbug10149/CTest.cmake
branches/1.2/cmake/cmake-2.8.1-modules/patchctestbug10149/CTestScriptMode.cmake
branches/1.2/cmake/cmake-2.8.1-modules/patchctestbug10149/CTestTargets.cmake
branches/1.2/cmake/cmake-2.8.3-modules/
branches/1.2/cmake/cmake-2.8.3-modules/FixWinInstallPrefix.cmake
branches/1.2/cmake/cmake-2.8.3-modules/autoinclude.cmake
branches/1.2/cmake/cmake-2.8.4-modules/
branches/1.2/cmake/cmake-2.8.4-modules/ImproveEclipseGCCErrors.cmake
branches/1.2/cmake/cmake-2.8.4-modules/autoinclude.cmake
branches/1.2/cmake/cmake-2.8.4-modules/boost/
branches/1.2/cmake/cmake-2.8.4-modules/boost/FindBoost.cmake
branches/1.2/cmake/cmake-2.9.0-modules/
branches/1.2/cmake/cmake-2.9.0-modules/RequireOutOfSourceBuild.cmake
branches/1.2/cmake/cmake-2.9.0-modules/autoinclude.cmake
branches/1.2/cmake/export-to-directory.sh
branches/1.2/cmake/ghost-fake-stl/
branches/1.2/cmake/ghost-fake-stl/iostream.h
branches/1.2/cmake/ghost-fake-stl/list.h
branches/1.2/cmake/ghost-fake-stl/set.h
branches/1.2/cmake/ghost-fake-stl/vector.h
branches/1.2/cmake/launcher-templates/
branches/1.2/cmake/launcher-templates/genericlauncher.cmd.in
branches/1.2/cmake/launcher-templates/genericlauncher.sh.in
branches/1.2/cmake/launcher-templates/launcher.env.cmd.in
branches/1.2/cmake/launcher-templates/launcher.env.sh.in
branches/1.2/cmake/launcher-templates/perconfig.vcproj.user.in
branches/1.2/cmake/launcher-templates/targetlauncher.cmd.in
branches/1.2/cmake/launcher-templates/targetlauncher.sh.in
branches/1.2/cmake/launcher-templates/vcproj.user.in
branches/1.2/cmake/module-docs/
branches/1.2/cmake/module-docs/AllModuleDependencies.dot
branches/1.2/cmake/module-docs/Example-FindMyPackage-UsingImportedTargets.cmake
branches/1.2/cmake/module-docs/Example-FindMyPackage.cmake
branches/1.2/cmake/module-docs/Example-FindMySimplePackage.cmake
branches/1.2/cmake/module-help.html
branches/1.2/cmake/module-help.txt
branches/1.2/cmake/nested_targets/
branches/1.2/cmake/nested_targets/DCubed/
branches/1.2/cmake/nested_targets/DCubed/CMakeLists.txt
branches/1.2/cmake/nested_targets/DCubed/d3ew_p/
branches/1.2/cmake/nested_targets/DCubed/d3ew_p/CMakeLists.txt
branches/1.2/cmake/nested_targets/DCubed/d3ew_scene/
branches/1.2/cmake/nested_targets/DCubed/d3ew_scene/CMakeLists.txt
branches/1.2/cmake/nested_targets/OpenHaptics/
branches/1.2/cmake/nested_targets/OpenHaptics/CMakeLists.txt
branches/1.2/cmake/nested_targets/Parasolid/
branches/1.2/cmake/nested_targets/Parasolid/CMakeLists.txt
branches/1.2/cmake/nested_targets/cutil/
branches/1.2/cmake/nested_targets/cutil/CMakeLists.txt
branches/1.2/cmake/package/
branches/1.2/cmake/package/macosx/
branches/1.2/cmake/package/macosx/Resources/
branches/1.2/cmake/package/macosx/Resources/en.lproj/
branches/1.2/cmake/package/macosx/Resources/en.lproj/MainMenu.nib/
branches/1.2/cmake/package/macosx/Resources/en.lproj/MainMenu.nib/classes.nib
branches/1.2/cmake/package/macosx/Resources/en.lproj/MainMenu.nib/info.nib
branches/1.2/cmake/package/macosx/Resources/vrjuggler.plist
branches/1.2/cmake/package/macosx/VRJuggler22BundleInfo.plist.in
branches/1.2/cmake/package/macosx/VRJuggler30BundleInfo.plist.in
branches/1.2/cmake/package/macosx/fixupbundle.cmake.in
branches/1.2/cmake/package-licensing/
branches/1.2/cmake/package-licensing/Boost.cmake
branches/1.2/cmake/package-licensing/Eigen.cmake
branches/1.2/cmake/package-licensing/FLTK.cmake
branches/1.2/cmake/package-licensing/Lua.cmake
branches/1.2/cmake/package-licensing/LuaBind.cmake
branches/1.2/cmake/package-licensing/OpenHapticsAcademicEdition.cmake
branches/1.2/cmake/package-licensing/OpenSceneGraph.cmake
branches/1.2/cmake/package-licensing/PhysicalModelingUtils.cmake
branches/1.2/cmake/package-licensing/Qt-LGPL.cmake
branches/1.2/cmake/package-licensing/VPS.cmake
branches/1.2/cmake/package-licensing/VRJuggLua.cmake
branches/1.2/cmake/package-licensing/VRJuggler.cmake
branches/1.2/cmake/package-licensing/VirtuoseAPI.cmake
branches/1.2/cmake/package-licensing/osgLua.cmake
branches/1.2/cmake/update-help.sh
branches/1.2/cmake/workarounds/
branches/1.2/cmake/workarounds/mac-alut-framework/
branches/1.2/cmake/workarounds/mac-alut-framework/AL/
branches/1.2/cmake/workarounds/mac-alut-framework/AL/alut.h
branches/1.2/cmake/workarounds/mac-gl/
branches/1.2/cmake/workarounds/mac-gl/GL/
branches/1.2/cmake/workarounds/mac-gl/GL/gl.h
branches/1.2/cmake/workarounds/mac-gl/GL/glui.h
branches/1.2/cmake/workarounds/mac-gl/GL/glut.h
branches/1.2/cmake/workarounds/mac-openal/
branches/1.2/cmake/workarounds/mac-openal/AL/
branches/1.2/cmake/workarounds/mac-openal/AL/al.h
branches/1.2/cmake/workarounds/mac-openal/AL/alc.h
branches/1.2/cmake/workarounds/tchar/
branches/1.2/cmake/workarounds/tchar/tchar.h
branches/1.2/cppdom/CMakeLists.txt
branches/1.2/test/CMakeLists.txt
branches/1.2/test/suite/CMakeLists.txt
Removed Paths:
-------------
branches/1.2/cmake/AboutTheseModules.cmake
branches/1.2/cmake/BoostTestTargets.cmake
branches/1.2/cmake/BoostTestTargetsDynamic.h
branches/1.2/cmake/BoostTestTargetsIncluded.h
branches/1.2/cmake/BoostTestTargetsStatic.h
branches/1.2/cmake/BundleOSGPlugins.cmake
branches/1.2/cmake/BundleOSGRuntime.cmake
branches/1.2/cmake/BundleVRJ22Runtime.cmake
branches/1.2/cmake/BundleVRJ30Runtime.cmake
branches/1.2/cmake/CheckMacHIDAPI.cmake
branches/1.2/cmake/CheckMacHIDAPI.cpp
branches/1.2/cmake/CheckVersion.cmake
branches/1.2/cmake/CleanDirectoryList.cmake
branches/1.2/cmake/CleanLibraryList.cmake
branches/1.2/cmake/CopyResourcesToBuildTree.cmake
branches/1.2/cmake/CppcheckTargets.cmake
branches/1.2/cmake/CreateDashboardScripts.cmake
branches/1.2/cmake/CreateImportedTarget.cmake
branches/1.2/cmake/CreateLaunchers.cmake
branches/1.2/cmake/DashboardScript.cmake.in
branches/1.2/cmake/DoxygenTargets.cmake
branches/1.2/cmake/DoxygenTargets.doxyfile.in
branches/1.2/cmake/EnableExtraCompilerWarnings.cmake
branches/1.2/cmake/EnableProfiling.cmake
branches/1.2/cmake/FileCopyTargets.cmake
branches/1.2/cmake/FindALUT.cmake
branches/1.2/cmake/FindBluez.cmake
branches/1.2/cmake/FindCPPDOM.cmake
branches/1.2/cmake/FindDCubed.cmake
branches/1.2/cmake/FindFlagpoll.cmake
branches/1.2/cmake/FindGDB.cmake
branches/1.2/cmake/FindGHOST.cmake
branches/1.2/cmake/FindGLUI.cmake
branches/1.2/cmake/FindGLUT.cmake
branches/1.2/cmake/FindGMTL.cmake
branches/1.2/cmake/FindGPM.cmake
branches/1.2/cmake/FindGadgeteer12.cmake
branches/1.2/cmake/FindGadgeteer20.cmake
branches/1.2/cmake/FindGlove5DT.cmake
branches/1.2/cmake/FindHIDAPI.cmake
branches/1.2/cmake/FindJCCL12.cmake
branches/1.2/cmake/FindJCCL14.cmake
branches/1.2/cmake/FindJtTk.cmake
branches/1.2/cmake/FindJtTk.stampkey.cmake.in
branches/1.2/cmake/FindLAPACKLibs.cmake
branches/1.2/cmake/FindLibusb1.cmake
branches/1.2/cmake/FindLuabind.cmake
branches/1.2/cmake/FindLyX.cmake
branches/1.2/cmake/FindMacHID.cmake
branches/1.2/cmake/FindOpenCV.cmake
branches/1.2/cmake/FindOpenHaptics.cmake
branches/1.2/cmake/FindOpenHaptics.cpp
branches/1.2/cmake/FindParasolid.cmake
branches/1.2/cmake/FindSonix12.cmake
branches/1.2/cmake/FindSonix14.cmake
branches/1.2/cmake/FindTR1.cmake
branches/1.2/cmake/FindTooN.cmake
branches/1.2/cmake/FindTooNtag.cmake
branches/1.2/cmake/FindTweek12.cmake
branches/1.2/cmake/FindTweek14.cmake
branches/1.2/cmake/FindVPR20.cmake
branches/1.2/cmake/FindVPR22.cmake
branches/1.2/cmake/FindVPS.cmake
branches/1.2/cmake/FindVRJ22.cmake
branches/1.2/cmake/FindVRJ30.cmake
branches/1.2/cmake/FindVRJOGL22.cmake
branches/1.2/cmake/FindVRJOGL30.cmake
branches/1.2/cmake/FindVRJuggler.cmake
branches/1.2/cmake/FindVRJuggler22.cmake
branches/1.2/cmake/FindVRJuggler30.cmake
branches/1.2/cmake/FindVRPN.cmake
branches/1.2/cmake/FindVirtuoseAPI.cmake
branches/1.2/cmake/FindVirtuoseVPP.cmake
branches/1.2/cmake/FindWiiSCAAT.cmake
branches/1.2/cmake/FindWiiUse.cmake
branches/1.2/cmake/FindWinHID.cmake
branches/1.2/cmake/Findargp.cmake
branches/1.2/cmake/Findcppcheck.cmake
branches/1.2/cmake/Findcppcheck.cpp
branches/1.2/cmake/Findcppunit.cmake
branches/1.2/cmake/Findcutil.cmake
branches/1.2/cmake/Finddb2pdf.cmake
branches/1.2/cmake/FindosgLua.cmake
branches/1.2/cmake/Findquatlib.cmake
branches/1.2/cmake/GetCPUDetails.cmake
branches/1.2/cmake/GetCompilerInfoString.cmake
branches/1.2/cmake/GetDirectoryList.cmake
branches/1.2/cmake/GetFileList.cmake
branches/1.2/cmake/GetForceIncludeDefinitions.cmake
branches/1.2/cmake/GetGitRevisionDescription.cmake
branches/1.2/cmake/GetGitRevisionDescription.cmake.in
branches/1.2/cmake/GetSubprojectStatus.cmake
branches/1.2/cmake/LICENSE_1_0.txt
branches/1.2/cmake/Licensing.cmake
branches/1.2/cmake/ListCombinations.cmake
branches/1.2/cmake/ListFilter.cmake
branches/1.2/cmake/LuaTargets.cmake
branches/1.2/cmake/MSVCMultipleProcessCompile.cmake
branches/1.2/cmake/MSVCStaticRuntime.cmake
branches/1.2/cmake/MSVCVerboseLinking.cmake
branches/1.2/cmake/MakeVRJugglerAppBundle.cmake
branches/1.2/cmake/MakeVRJugglerAppBundle30.cmake
branches/1.2/cmake/OptionRequires.cmake
branches/1.2/cmake/PrefixListGlob.cmake
branches/1.2/cmake/ProgramFilesGlob.cmake
branches/1.2/cmake/README.markdown
branches/1.2/cmake/ResetConfigurations.cmake
branches/1.2/cmake/SearchProgramFilesForOpenSceneGraph.cmake
branches/1.2/cmake/SetDefaultBuildType.cmake
branches/1.2/cmake/SplitLibraryList.cmake
branches/1.2/cmake/StampSourcesWithVersion.cmake
branches/1.2/cmake/StampSourcesWithVersion.sed.in
branches/1.2/cmake/TCHARWorkaround.cmake
branches/1.2/cmake/UseBackportedModules.cmake
branches/1.2/cmake/UseTR1.cmake
branches/1.2/cmake/WarningDev.cmake
branches/1.2/cmake/cmake-2.8.0-modules/
branches/1.2/cmake/cmake-2.8.0-modules/features/
branches/1.2/cmake/cmake-2.8.0-modules/features/SelectLibraryConfigurations.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindOpenSceneGraph.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindOpenThreads.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/Findosg.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgAnimation.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgDB.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgFX.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgGA.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgIntrospection.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgManipulator.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgParticle.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgProducer.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgShadow.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgSim.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgTerrain.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgText.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgUtil.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgViewer.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgVolume.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/FindosgWidget.cmake
branches/1.2/cmake/cmake-2.8.0-modules/osg/Findosg_functions.cmake
branches/1.2/cmake/cmake-2.8.1-modules/
branches/1.2/cmake/cmake-2.8.1-modules/patchctestbug10149/
branches/1.2/cmake/cmake-2.8.1-modules/patchctestbug10149/CTest.cmake
branches/1.2/cmake/cmake-2.8.1-modules/patchctestbug10149/CTestScriptMode.cmake
branches/1.2/cmake/cmake-2.8.1-modules/patchctestbug10149/CTestTargets.cmake
branches/1.2/cmake/cmake-2.8.3-modules/
branches/1.2/cmake/cmake-2.8.3-modules/FixWinInstallPrefix.cmake
branches/1.2/cmake/cmake-2.8.3-modules/autoinclude.cmake
branches/1.2/cmake/cmake-2.8.4-modules/
branches/1.2/cmake/cmake-2.8.4-modules/ImproveEclipseGCCErrors.cmake
branches/1.2/cmake/cmake-2.8.4-modules/autoinclude.cmake
branches/1.2/cmake/cmake-2.8.4-modules/boost/
branches/1.2/cmake/cmake-2.8.4-modules/boost/FindBoost.cmake
branches/1.2/cmake/cmake-2.9.0-modules/
branches/1.2/cmake/cmake-2.9.0-modules/RequireOutOfSourceBuild.cmake
branches/1.2/cmake/cmake-2.9.0-modules/autoinclude.cmake
branches/1.2/cmake/export-to-directory.sh
branches/1.2/cmake/ghost-fake-stl/
branches/1.2/cmake/ghost-fake-stl/iostream.h
branches/1.2/cmake/ghost-fake-stl/list.h
branches/1.2/cmake/ghost-fake-stl/set.h
branches/1.2/cmake/ghost-fake-stl/vector.h
branches/1.2/cmake/launcher-templates/
branches/1.2/cmake/launcher-templates/genericlauncher.cmd.in
branches/1.2/cmake/launcher-templates/genericlauncher.sh.in
branches/1.2/cmake/launcher-templates/launcher.env.cmd.in
branches/1.2/cmake/launcher-templates/launcher.env.sh.in
branches/1.2/cmake/launcher-templates/perconfig.vcproj.user.in
branches/1.2/cmake/launcher-templates/targetlauncher.cmd.in
branches/1.2/cmake/launcher-templates/targetlauncher.sh.in
branches/1.2/cmake/launcher-templates/vcproj.user.in
branches/1.2/cmake/module-docs/
branches/1.2/cmake/module-docs/AllModuleDependencies.dot
branches/1.2/cmake/module-docs/Example-FindMyPackage-UsingImportedTargets.cmake
branches/1.2/cmake/module-docs/Example-FindMyPackage.cmake
branches/1.2/cmake/module-docs/Example-FindMySimplePackage.cmake
branches/1.2/cmake/module-help.html
branches/1.2/cmake/module-help.txt
branches/1.2/cmake/nested_targets/
branches/1.2/cmake/nested_targets/DCubed/
branches/1.2/cmake/nested_targets/DCubed/CMakeLists.txt
branches/1.2/cmake/nested_targets/DCubed/d3ew_p/
branches/1.2/cmake/nested_targets/DCubed/d3ew_p/CMakeLists.txt
branches/1.2/cmake/nested_targets/DCubed/d3ew_scene/
branches/1.2/cmake/nested_targets/DCubed/d3ew_scene/CMakeLists.txt
branches/1.2/cmake/nested_targets/OpenHaptics/
branches/1.2/cmake/nested_targets/OpenHaptics/CMakeLists.txt
branches/1.2/cmake/nested_targets/Parasolid/
branches/1.2/cmake/nested_targets/Parasolid/CMakeLists.txt
branches/1.2/cmake/nested_targets/cutil/
branches/1.2/cmake/nested_targets/cutil/CMakeLists.txt
branches/1.2/cmake/package/
branches/1.2/cmake/package/macosx/
branches/1.2/cmake/package/macosx/Resources/
branches/1.2/cmake/package/macosx/Resources/en.lproj/
branches/1.2/cmake/package/macosx/Resources/en.lproj/MainMenu.nib/
branches/1.2/cmake/package/macosx/Resources/en.lproj/MainMenu.nib/classes.nib
branches/1.2/cmake/package/macosx/Resources/en.lproj/MainMenu.nib/info.nib
branches/1.2/cmake/package/macosx/Resources/vrjuggler.plist
branches/1.2/cmake/package/macosx/VRJuggler22BundleInfo.plist.in
branches/1.2/cmake/package/macosx/VRJuggler30BundleInfo.plist.in
branches/1.2/cmake/package/macosx/fixupbundle.cmake.in
branches/1.2/cmake/package-licensing/
branches/1.2/cmake/package-licensing/Boost.cmake
branches/1.2/cmake/package-licensing/Eigen.cmake
branches/1.2/cmake/package-licensing/FLTK.cmake
branches/1.2/cmake/package-licensing/Lua.cmake
branches/1.2/cmake/package-licensing/LuaBind.cmake
branches/1.2/cmake/package-licensing/OpenHapticsAcademicEdition.cmake
branches/1.2/cmake/package-licensing/OpenSceneGraph.cmake
branches/1.2/cmake/package-licensing/PhysicalModelingUtils.cmake
branches/1.2/cmake/package-licensing/Qt-LGPL.cmake
branches/1.2/cmake/package-licensing/VPS.cmake
branches/1.2/cmake/package-licensing/VRJuggLua.cmake
branches/1.2/cmake/package-licensing/VRJuggler.cmake
branches/1.2/cmake/package-licensing/VirtuoseAPI.cmake
branches/1.2/cmake/package-licensing/osgLua.cmake
branches/1.2/cmake/update-help.sh
branches/1.2/cmake/workarounds/
branches/1.2/cmake/workarounds/mac-alut-framework/
branches/1.2/cmake/workarounds/mac-alut-framework/AL/
branches/1.2/cmake/workarounds/mac-alut-framework/AL/alut.h
branches/1.2/cmake/workarounds/mac-gl/
branches/1.2/cmake/workarounds/mac-gl/GL/
branches/1.2/cmake/workarounds/mac-gl/GL/gl.h
branches/1.2/cmake/workarounds/mac-gl/GL/glui.h
branches/1.2/cmake/workarounds/mac-gl/GL/glut.h
branches/1.2/cmake/workarounds/mac-openal/
branches/1.2/cmake/workarounds/mac-openal/AL/
branches/1.2/cmake/workarounds/mac-openal/AL/al.h
branches/1.2/cmake/workarounds/mac-openal/AL/alc.h
branches/1.2/cmake/workarounds/tchar/
branches/1.2/cmake/workarounds/tchar/tchar.h
Copied: branches/1.2/CMakeLists.txt (from rev 690, trunk/CMakeLists.txt)
===================================================================
--- branches/1.2/CMakeLists.txt (rev 0)
+++ branches/1.2/CMakeLists.txt 2012-07-04 20:35:57 UTC (rev 693)
@@ -0,0 +1,100 @@
+# CMake-based build system for cppdom
+# 2009-2011 Ryan Pavlik <rp...@ia...>
+# http://academic.cleardefinition.com/
+# Iowa State University HCI Graduate Program/VRAC
+
+cmake_minimum_required(VERSION 2.6.2)
+
+# Set package properties
+project(cppdom)
+
+set(CPACK_PACKAGE_VERSION_MAJOR "1")
+set(CPACK_PACKAGE_VERSION_MINOR "0")
+set(CPACK_PACKAGE_VERSION_PATCH "3")
+set(CPACK_PACKAGE_VERSION
+ "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+set(VERSION_UNDERSCORES "${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}_${CPACK_PACKAGE_VERSION_PATCH}")
+###
+# Set up options
+###
+
+# Define directories
+set(BIN_DIR bin)
+set(ARCH_DIR lib)
+set(FLAGPOLL_INFO_DIR share/flagpoll)
+if(WIN32)
+ set(LIB_DIR bin)
+ set(INCLUDE_DIR include)
+else()
+ set(LIB_DIR lib)
+ set(INCLUDE_DIR include/cppdom-${CPACK_PACKAGE_VERSION})
+endif()
+
+# Create flagpoll file
+set(provides "cppdom")
+set(version "${CPACK_PACKAGE_VERSION}")
+set(prefix "\${fp_file_cwd}/../..")
+set(exec_prefix "\${prefix}")
+set(includedir "\${fp_file_cwd}/../../${INCLUDE_DIR}")
+set(libdir "\${fp_file_cwd}/../../${LIB_DIR}")
+# TODO this is not ideal/complete
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set(arch "x86_64")
+else()
+ set(arch "x86")
+endif()
+if(CMAKE_COMPILER_IS_GNUCXX)
+ set(cppdom_cxxflags "-Wno-deprecated")
+ set(include_path_flag "-I")
+ set(cppdom_libs "-lcppdom-${VERSION_UNDERSCORES}")
+ set(lib_path_flag "-L")
+elseif(MSVC)
+ set(include_path_flag "/I")
+ set(lib_path_flag "/L")
+else()
+ message(FATAL_ERROR "Compiler not recognized - can't generate values for Flagpoll file")
+endif()
+
+configure_file(cppdom.fpc.in "${CMAKE_CURRENT_BINARY_DIR}/cppdom.fpc" @ONLY)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cppdom.fpc"
+ DESTINATION ${FLAGPOLL_INFO_DIR}
+ COMPONENT Development)
+
+###
+# Perform build configuration of dependencies
+###
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+include(UseBackportedModules)
+include(CTest)
+
+find_package(Boost)
+
+###
+# Build the project
+###
+
+include_directories(.)
+add_subdirectory(cppdom)
+
+add_subdirectory(test)
+
+###
+# Set packaging options (for CPack)
+###
+
+# Choose desired package generators
+if(APPLE)
+ set(CPACK_GENERATOR DragNDrop)
+ set(CPACK_SOURCE_GENERATOR ZIP)
+elseif(WIN32)
+ set(CPACK_SOURCE_GENERATOR ZIP)
+else()
+ set(CPACK_SOURCE_GENERATOR TARGZ)
+endif()
+
+# Include the packaging system now that we have it all set up
+include(CPack)
+
+###
+# End Packaging
+###
Modified: branches/1.2/ChangeLog
===================================================================
--- branches/1.2/ChangeLog 2012-07-04 20:32:43 UTC (rev 692)
+++ branches/1.2/ChangeLog 2012-07-04 20:35:57 UTC (rev 693)
@@ -1,5 +1,8 @@
DATE AUTHOR CHANGE
---------- ----------- -------------------------------------------------------
+2012-07-04 patrickh Add CMake build.
+ Developed by Ryan Pavlik.
+
[Version 1.2.0 released - 5.1.2011]============================================
2011-04-23 patrickh SCons 2.0 is now the minimum required version.
Deleted: branches/1.2/cmake/AboutTheseModules.cmake
===================================================================
--- trunk/cmake/AboutTheseModules.cmake 2012-07-04 20:30:43 UTC (rev 690)
+++ branches/1.2/cmake/AboutTheseModules.cmake 2012-07-04 20:35:57 UTC (rev 693)
@@ -1,34 +0,0 @@
-# - Dummy 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.
-# Additionally, you can find instructions on how to integrate these modules
-# into your own project either in the README.markdown file in this directory,
-# or on the GitHub page listed above (scroll to the bottom to see the README
-# rendered attractively).
-#
-# In short: Modules of the form "FindSomeName.cmake" are considered to be
-# "find modules", and are intended to be used indirectly by calling find_package,
-# not by calling include. Thus, you'll want to do something like:
-# find_package(SomeName)
-# They define a number of variables allowing you to use whatever software
-# they search for, such as include directories and libraries. A few also
-# define some functions for your use.
-#
-# All other modules provide functionality, either immediately upon including
-# them, or by defining functions that perform some task of varying utility
-# that you can use any time after including them. Note that if a module
-# has the filename, for example, cmake/BoostTestTargets.cmake, you only
-# need to call:
-# include(BoostTestTargets)
-#
-# For more information, see the documentation for individual modules, the
-# cmake-modules github page, and/or the upstream CMake documentation at
-# http://www.cmake.org/cmake/help/cmake-2-8-docs.html
-#
-#
-# 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)
-
Copied: branches/1.2/cmake/AboutTheseModules.cmake (from rev 690, trunk/cmake/AboutTheseModules.cmake)
===================================================================
--- branches/1.2/cmake/AboutTheseModules.cmake (rev 0)
+++ branches/1.2/cmake/AboutTheseModules.cmake 2012-07-04 20:35:57 UTC (rev 693)
@@ -0,0 +1,34 @@
+# - Dummy 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.
+# Additionally, you can find instructions on how to integrate these modules
+# into your own project either in the README.markdown file in this directory,
+# or on the GitHub page listed above (scroll to the bottom to see the README
+# rendered attractively).
+#
+# In short: Modules of the form "FindSomeName.cmake" are considered to be
+# "find modules", and are intended to be used indirectly by calling find_package,
+# not by calling include. Thus, you'll want to do something like:
+# find_package(SomeName)
+# They define a number of variables allowing you to use whatever software
+# they search for, such as include directories and libraries. A few also
+# define some functions for your use.
+#
+# All other modules provide functionality, either immediately upon including
+# them, or by defining functions that perform some task of varying utility
+# that you can use any time after including them. Note that if a module
+# has the filename, for example, cmake/BoostTestTargets.cmake, you only
+# need to call:
+# include(BoostTestTargets)
+#
+# For more information, see the documentation for individual modules, the
+# cmake-modules github page, and/or the upstream CMake documentation at
+# http://www.cmake.org/cmake/help/cmake-2-8-docs.html
+#
+#
+# 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)
+
Deleted: branches/1.2/cmake/BoostTestTargets.cmake
===================================================================
--- trunk/cmake/BoostTestTargets.cmake 2012-07-04 20:30:43 UTC (rev 690)
+++ branches/1.2/cmake/BoostTestTargets.cmake 2012-07-04 20:35:57 UTC (rev 693)
@@ -1,274 +0,0 @@
-# - Add tests using boost::test
-#
-# Add this line to your test files in place of including a basic boost test header:
-# #include <BoostTestTargetConfig.h>
-#
-# If you cannot do that and must use the included form for a given test,
-# include the line
-# // OVERRIDE_BOOST_TEST_INCLUDED_WARNING
-# in the same file with the boost test include.
-#
-# include(BoostTestTargets)
-# add_boost_test(<testdriver_name> SOURCES <source1> [<more sources...>]
-# [FAIL_REGULAR_EXPRESSION <additional fail regex>]
-# [LAUNCHER <generic launcher script>]
-# [LIBRARIES <library> [<library>...]]
-# [RESOURCES <resource> [<resource>...]]
-# [TESTS <testcasename> [<testcasename>...]])
-#
-# If for some reason you need access to the executable target created,
-# it can be found in ${${testdriver_name}_TARGET_NAME} as specified when
-# you called add_boost_test
-#
-# Requires CMake 2.6 or newer (uses the 'function' command)
-#
-# Requires:
-# GetForceIncludeDefinitions
-# CopyResourcesToBuildTree
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
-# 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)
-
-if(__add_boost_test)
- return()
-endif()
-set(__add_boost_test YES)
-
-set(BOOST_TEST_TARGET_PREFIX "boosttest")
-
-if(NOT Boost_FOUND)
- find_package(Boost 1.34.0 QUIET)
-endif()
-if("${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. "
- "(found: '${Boost_VERSION}'; want >=103400) ")
- if(BUILD_TESTING)
- message(FATAL_ERROR
- ${_shared_msg}
- "You may disable BUILD_TESTING to continue without the "
- "tests.")
- else()
- message(STATUS
- ${_shared_msg}
- "BUILD_TESTING disabled, so continuing anyway.")
- endif()
-endif()
-
-include(GetForceIncludeDefinitions)
-include(CopyResourcesToBuildTree)
-
-if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000")
- set(_boosttesttargets_libs)
- set(_boostConfig "BoostTestTargetsIncluded.h")
- if(NOT Boost_UNIT_TEST_FRAMEWORK_LIBRARY)
- find_package(Boost 1.34.0 QUIET COMPONENTS unit_test_framework)
- endif()
- if(Boost_UNIT_TEST_FRAMEWORK_LIBRARY)
- set(_boosttesttargets_libs "${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}")
- if(Boost_USE_STATIC_LIBS)
- set(_boostConfig "BoostTestTargetsStatic.h")
- else()
- if(NOT APPLE)
- set(_boostConfig "BoostTestTargetsDynamic.h")
- endif()
- endif()
- endif()
- get_filename_component(_moddir ${CMAKE_CURRENT_LIST_FILE} PATH)
- configure_file("${_moddir}/${_boostConfig}"
- "${CMAKE_CURRENT_BINARY_DIR}/BoostTestTargetConfig.h"
- COPYONLY)
- include_directories("${CMAKE_CURRENT_BINARY_DIR}")
-endif()
-
-function(add_boost_test _name)
- if(NOT BUILD_TESTING)
- return()
- endif()
- if("${CMAKE_VERSION}" VERSION_LESS "2.8.0")
- if(NOT "${_boost_test_cmakever_pestered}x" EQUALS "${CMAKE_VERSION}x")
- message(STATUS
- "Not adding boost::test targets - CMake 2.8.0 or newer required, using ${CMAKE_VERSION}")
- set(_boost_test_cmakever_pestered
- "${CMAKE_VERSION}"
- CACHE
- INTERNAL
- ""
- FORCE)
- endif()
- return()
- endif()
-
- # parse arguments
- set(_nowhere)
- set(_curdest _nowhere)
- set(_val_args
- SOURCES
- FAIL_REGULAR_EXPRESSION
- LAUNCHER
- LIBRARIES
- RESOURCES
- TESTS)
- set(_bool_args
- USE_COMPILED_LIBRARY)
- foreach(_arg ${_val_args} ${_bool_args})
- set(${_arg})
- endforeach()
- foreach(_element ${ARGN})
- 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 add_boost_test!")
- endif()
-
- if(NOT SOURCES)
- message(FATAL_ERROR
- "Syntax error in use of add_boost_test: at least one source file required!")
- endif()
-
- if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000")
-
- include_directories(${Boost_INCLUDE_DIRS})
-
- set(includeType)
- foreach(src ${SOURCES})
- file(READ ${src} thefile)
- if("${thefile}" MATCHES ".*BoostTestTargetConfig.h.*")
- set(includeType CONFIGURED)
- set(includeFileLoc ${src})
- break()
- elseif("${thefile}" MATCHES ".*boost/test/included/unit_test.hpp.*")
- set(includeType INCLUDED)
- set(includeFileLoc ${src})
- set(_boosttesttargets_libs) # clear this out - linking would be a bad idea
- if(NOT
- "${thefile}"
- MATCHES
- ".*OVERRIDE_BOOST_TEST_INCLUDED_WARNING.*")
- message("Please replace the include line in ${src} with this alternate include line instead:")
- message(" \#include <BoostTestTargetConfig.h>")
- message("Once you've saved your changes, re-run CMake. (See BoostTestTargets.cmake for more info)")
- endif()
- break()
- endif()
- endforeach()
-
- if(NOT _boostTestTargetsNagged${_name} STREQUAL "${includeType}")
- if("includeType" STREQUAL "CONFIGURED")
- message(STATUS
- "Test '${_name}' uses the CMake-configurable form of the boost test framework - congrats! (Including File: ${includeFileLoc})")
- elseif("${includeType}" STREQUAL "INCLUDED")
- message("In test '${_name}': ${includeFileLoc} uses the 'included' form of the boost unit test framework.")
- else()
- message("In test '${_name}': Didn't detect the CMake-configurable boost test include.")
- message("Please replace your existing boost test include in that test with the following:")
- message(" \#include <BoostTestTargetConfig.h>")
- message("Once you've saved your changes, re-run CMake. (See BoostTestTargets.cmake for more info)")
- endif()
- endif()
- set(_boostTestTargetsNagged${_name}
- "${includeType}"
- CACHE
- INTERNAL
- ""
- FORCE)
-
-
- if(RESOURCES)
- list(APPEND SOURCES ${RESOURCES})
- endif()
-
- # Generate a unique target name, using the relative binary dir
- # and provided name. (transform all / into _ and remove all other
- # non-alphabet characters)
- file(RELATIVE_PATH
- targetpath
- "${CMAKE_BINARY_DIR}"
- "${CMAKE_CURRENT_BINARY_DIR}")
- string(REGEX REPLACE "[^A-Za-z/_]" "" targetpath "${targetpath}")
- string(REPLACE "/" "_" targetpath "${targetpath}")
-
- set(_target_name ${BOOST_TEST_TARGET_PREFIX}-${targetpath}-${_name})
- set(${_name}_TARGET_NAME "${_target_name}" PARENT_SCOPE)
-
- # Build the test.
- add_executable(${_target_name} ${SOURCES})
-
- list(APPEND LIBRARIES ${_boosttesttargets_libs})
-
- if(LIBRARIES)
- target_link_libraries(${_target_name} ${LIBRARIES})
- endif()
-
- if(RESOURCES)
- set_property(TARGET ${_target_name} PROPERTY RESOURCE ${RESOURCES})
- copy_resources_to_build_tree(${_target_name})
- endif()
-
- if(NOT Boost_TEST_FLAGS)
-# set(Boost_TEST_FLAGS --catch_system_error=yes --output_format=XML)
- set(Boost_TEST_FLAGS --catch_system_error=yes)
- endif()
-
- # TODO: Figure out why only recent boost handles individual test running properly
-
- if(LAUNCHER)
- set(_test_command ${LAUNCHER} "\$<TARGET_FILE:${_target_name}>")
- else()
- set(_test_command ${_target_name})
- endif()
-
- if(TESTS AND ( "${Boost_VERSION}" VERSION_GREATER "103799" ))
- foreach(_test ${TESTS})
- add_test(NAME
- ${_name}-${_test}
- COMMAND
- ${_test_command}
- --run_test=${_test}
- ${Boost_TEST_FLAGS})
- if(FAIL_REGULAR_EXPRESSION)
- set_tests_properties(${_name}-${_test}
- PROPERTIES
- FAIL_REGULAR_EXPRESSION
- "${FAIL_REGULAR_EXPRESSION}")
- endif()
- endforeach()
- else()
- add_test(NAME
- ${_name}-boost_test
- COMMAND
- ${_test_command}
- ${Boost_TEST_FLAGS})
- if(FAIL_REGULAR_EXPRESSION)
- set_tests_properties(${_name}-${_test}
- PROPERTIES
- FAIL_REGULAR_EXPRESSION
- "${FAIL_REGULAR_EXPRESSION}")
- endif()
- endif()
-
- # CppCheck the test if we can.
- if(COMMAND add_cppcheck)
- add_cppcheck(${_target_name} STYLE UNUSED_FUNCTIONS)
- endif()
-
- endif()
-endfunction()
Copied: branches/1.2/cmake/BoostTestTargets.cmake (from rev 690, trunk/cmake/BoostTestTargets.cmake)
===================================================================
--- branches/1.2/cmake/BoostTestTargets.cmake (rev 0)
+++ branches/1.2/cmake/BoostTestTargets.cmake 2012-07-04 20:35:57 UTC (rev 693)
@@ -0,0 +1,274 @@
+# - Add tests using boost::test
+#
+# Add this line to your test files in place of including a basic boost test header:
+# #include <BoostTestTargetConfig.h>
+#
+# If you cannot do that and must use the included form for a given test,
+# include the line
+# // OVERRIDE_BOOST_TEST_INCLUDED_WARNING
+# in the same file with the boost test include.
+#
+# include(BoostTestTargets)
+# add_boost_test(<testdriver_name> SOURCES <source1> [<more sources...>]
+# [FAIL_REGULAR_EXPRESSION <additional fail regex>]
+# [LAUNCHER <generic launcher script>]
+# [LIBRARIES <library> [<library>...]]
+# [RESOURCES <resource> [<resource>...]]
+# [TESTS <testcasename> [<testcasename>...]])
+#
+# If for some reason you need access to the executable target created,
+# it can be found in ${${testdriver_name}_TARGET_NAME} as specified when
+# you called add_boost_test
+#
+# Requires CMake 2.6 or newer (uses the 'function' command)
+#
+# Requires:
+# GetForceIncludeDefinitions
+# CopyResourcesToBuildTree
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
+# 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)
+
+if(__add_boost_test)
+ return()
+endif()
+set(__add_boost_test YES)
+
+set(BOOST_TEST_TARGET_PREFIX "boosttest")
+
+if(NOT Boost_FOUND)
+ find_package(Boost 1.34.0 QUIET)
+endif()
+if("${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. "
+ "(found: '${Boost_VERSION}'; want >=103400) ")
+ if(BUILD_TESTING)
+ message(FATAL_ERROR
+ ${_shared_msg}
+ "You may disable BUILD_TESTING to continue without the "
+ "tests.")
+ else()
+ message(STATUS
+ ${_shared_msg}
+ "BUILD_TESTING disabled, so continuing anyway.")
+ endif()
+endif()
+
+include(GetForceIncludeDefinitions)
+include(CopyResourcesToBuildTree)
+
+if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000")
+ set(_boosttesttargets_libs)
+ set(_boostConfig "BoostTestTargetsIncluded.h")
+ if(NOT Boost_UNIT_TEST_FRAMEWORK_LIBRARY)
+ find_package(Boost 1.34.0 QUIET COMPONENTS unit_test_framework)
+ endif()
+ if(Boost_UNIT_TEST_FRAMEWORK_LIBRARY)
+ set(_boosttesttargets_libs "${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}")
+ if(Boost_USE_STATIC_LIBS)
+ set(_boostConfig "BoostTestTargetsStatic.h")
+ else()
+ if(NOT APPLE)
+ set(_boostConfig "BoostTestTargetsDynamic.h")
+ endif()
+ endif()
+ endif()
+ get_filename_component(_moddir ${CMAKE_CURRENT_LIST_FILE} PATH)
+ configure_file("${_moddir}/${_boostConfig}"
+ "${CMAKE_CURRENT_BINARY_DIR}/BoostTestTargetConfig.h"
+ COPYONLY)
+ include_directories("${CMAKE_CURRENT_BINARY_DIR}")
+endif()
+
+function(add_boost_test _name)
+ if(NOT BUILD_TESTING)
+ return()
+ endif()
+ if("${CMAKE_VERSION}" VERSION_LESS "2.8.0")
+ if(NOT "${_boost_test_cmakever_pestered}x" EQUALS "${CMAKE_VERSION}x")
+ message(STATUS
+ "Not adding boost::test targets - CMake 2.8.0 or newer required, using ${CMAKE_VERSION}")
+ set(_boost_test_cmakever_pestered
+ "${CMAKE_VERSION}"
+ CACHE
+ INTERNAL
+ ""
+ FORCE)
+ endif()
+ return()
+ endif()
+
+ # parse arguments
+ set(_nowhere)
+ set(_curdest _nowhere)
+ set(_val_args
+ SOURCES
+ FAIL_REGULAR_EXPRESSION
+ LAUNCHER
+ LIBRARIES
+ RESOURCES
+ TESTS)
+ set(_bool_args
+ USE_COMPILED_LIBRARY)
+ foreach(_arg ${_val_args} ${_bool_args})
+ set(${_arg})
+ endforeach()
+ foreach(_element ${ARGN})
+ 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 add_boost_test!")
+ endif()
+
+ if(NOT SOURCES)
+ message(FATAL_ERROR
+ "Syntax error in use of add_boost_test: at least one source file required!")
+ endif()
+
+ if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000")
+
+ include_directories(${Boost_INCLUDE_DIRS})
+
+ set(includeType)
+ foreach(src ${SOURCES})
+ file(READ ${src} thefile)
+ if("${thefile}" MATCHES ".*BoostTestTargetConfig.h.*")
+ set(includeType CONFIGURED)
+ set(includeFileLoc ${src})
+ break()
+ elseif("${thefile}" MATCHES ".*boost/test/included/unit_test.hpp.*")
+ set(includeType INCLUDED)
+ set(includeFileLoc ${src})
+ set(_boosttesttargets_libs) # clear this out - linking would be a bad idea
+ if(NOT
+ "${thefile}"
+ MATCHES
+ ".*OVERRIDE_BOOST_TEST_INCLUDED_WARNING.*")
+ message("Please replace the include line in ${src} with this alternate include line instead:")
+ message(" \#include <BoostTestTargetConfig.h>")
+ message("Once you've saved your changes, re-run CMake. (See BoostTestTargets.cmake for more info)")
+ endif()
+ break()
+ endif()
+ endforeach()
+
+ if(NOT _boostTestTargetsNagged${_name} STREQUAL "${includeType}")
+ if("includeType" STREQUAL "CONFIGURED")
+ message(STATUS
+ "Test '${_name}' uses the CMake-configurable form of the boost test framework - congrats! (Including File: ${includeFileLoc})")
+ elseif("${includeType}" STREQUAL "INCLUDED")
+ message("In test '${_name}': ${includeFileLoc} uses the 'included' form of the boost unit test framework.")
+ else()
+ message("In test '${_name}': Didn't detect the CMake-configurable boost test include.")
+ message("Please replace your existing boost test include in that test with the following:")
+ message(" \#include <BoostTestTargetConfig.h>")
+ message("Once you've saved your changes, re-run CMake. (See BoostTestTargets.cmake for more info)")
+ endif()
+ endif()
+ set(_boostTestTargetsNagged${_name}
+ "${includeType}"
+ CACHE
+ INTERNAL
+ ""
+ FORCE)
+
+
+ if(RESOURCES)
+ list(APPEND SOURCES ${RESOURCES})
+ endif()
+
+ # Generate a unique target name, using the relative binary dir
+ # and provided name. (transform all / into _ and remove all other
+ # non-alphabet characters)
+ file(RELATIVE_PATH
+ targetpath
+ "${CMAKE_BINARY_DIR}"
+ "${CMAKE_CURRENT_BINARY_DIR}")
+ string(REGEX REPLACE "[^A-Za-z/_]" "" targetpath "${targetpath}")
+ string(REPLACE "/" "_" targetpath "${targetpath}")
+
+ set(_target_name ${BOOST_TEST_TARGET_PREFIX}-${targetpath}-${_name})
+ set(${_name}_TARGET_NAME "${_target_name}" PARENT_SCOPE)
+
+ # Build the test.
+ add_executable(${_target_name} ${SOURCES})
+
+ list(APPEND LIBRARIES ${_boosttesttargets_libs})
+
+ if(LIBRARIES)
+ target_link_libraries(${_target_name} ${LIBRARIES})
+ endif()
+
+ if(RESOURCES)
+ set_property(TARGET ${_target_name} PROPERTY RESOURCE ${RESOURCES})
+ copy_resources_to_build_tree(${_target_name})
+ endif()
+
+ if(NOT Boost_TEST_FLAGS)
+# set(Boost_TEST_FLAGS --catch_system_error=yes --output_format=XML)
+ set(Boost_TEST_FLAGS --catch_system_error=yes)
+ endif()
+
+ # TODO: Figure out why only recent boost handles individual test running properly
+
+ if(LAUNCHER)
+ set(_test_command ${LAUNCHER} "\$<TARGET_FILE:${_target_name}>")
+ else()
+ set(_test_command ${_target_name})
+ endif()
+
+ if(TESTS AND ( "${Boost_VERSION}" VERSION_GREATER "103799" ))
+ foreach(_test ${TESTS})
+ add_test(NAME
+ ${_name}-${_test}
+ COMMAND
+ ${_test_command}
+ --run_test=${_test}
+ ${Boost_TEST_FLAGS})
+ if(FAIL_REGULAR_EXPRESSION)
+ set_tests_properties(${_name}-${_test}
+ PROPERTIES
+ FAIL_REGULAR_EXPRESSION
+ "${FAIL_REGULAR_EXPRESSION}")
+ endif()
+ endforeach()
+ else()
+ add_test(NAME
+ ${_name}-boost_test
+ COMMAND
+ ${_test_command}
+ ${Boost_TEST_FLAGS})
+ if(FAIL_REGULAR_EXPRESSION)
+ set_tests_properties(${_name}-${_test}
+ PROPERTIES
+ FAIL_REGULAR_EXPRESSION
+ "${FAIL_REGULAR_EXPRESSION}")
+ endif()
+ endif()
+
+ # CppCheck the test if we can.
+ if(COMMAND add_cppcheck)
+ add_cppcheck(${_target_name} STYLE UNUSED_FUNCTIONS)
+ endif()
+
+ endif()
+endfunction()
Deleted: branches/1.2/cmake/BoostTestTargetsDynamic.h
===================================================================
--- trunk/cmake/BoostTestTargetsDynamic.h 2012-07-04 20:30:43 UTC (rev 690)
+++ branches/1.2/cmake/BoostTestTargetsDynamic.h 2012-07-04 20:35:57 UTC (rev 693)
@@ -1,9 +0,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.
-
-// Using the Boost UTF dynamic library
-
-#define BOOST_TEST_DYN_LINK
-#include <boost/test/unit_test.hpp>
-
Copied: branches/1.2/cmake/BoostTestTargetsDynamic.h (from rev 690, trunk/cmake/BoostTestTargetsDynamic.h)
===================================================================
--- branches/1.2/cmake/BoostTestTargetsDynamic.h (rev 0)
+++ branches/1.2/cmake/BoostTestTargetsDynamic.h 2012-07-04 20:35:57 UTC (rev 693)
@@ -0,0 +1,9 @@
+// Small header computed by CMake to set up boost test.
+// include AFTER #define BOOST_TEST_MODULE whatever
+// but before any other boost test includes.
+
+// Using the Boost UTF dynamic library
+
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
+
Deleted: branches/1.2/cmake/BoostTestTargetsIncluded.h
===================================================================
--- trunk/cmake/BoostTestTargetsIncluded.h 2012-07-04 20:30:43 UTC (rev 690)
+++ branches/1.2/cmake/BoostTestTargetsIncluded.h 2012-07-04 20:35:57 UTC (rev 693)
@@ -1,7 +0,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.
-
-// Using the Boost UTF included framework
-
-#include <boost/test/included/unit_test.hpp>
Copied: branches/1.2/cmake/BoostTestTargetsIncluded.h (from rev 690, trunk/cmake/BoostTestTargetsIncluded.h)
===================================================================
--- branches/1.2/cmake/BoostTestTargetsIncluded.h (rev 0)
+++ branches/1.2/cmake/BoostTestTargetsIncluded.h 2012-07-04 20:35:57 UTC (rev 693)
@@ -0,0 +1,7 @@
+// Small header computed by CMake to set up boost test.
+// include AFTER #define BOOST_TEST_MODULE whatever
+// but before any other boost test includes.
+
+// Using the Boost UTF included framework
+
+#include <boost/test/included/unit_test.hpp>
Deleted: branches/1.2/cmake/BoostTestTargetsStatic.h
===================================================================
--- trunk/cmake/BoostTestTargetsStatic.h 2012-07-04 20:30:43 UTC (rev 690)
+++ branches/1.2/cmake/BoostTestTargetsStatic.h 2012-07-04 20:35:57 UTC (rev 693)
@@ -1,7 +0,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.
-
-// Using the Boost UTF static library
-
-#include <boost/test/unit_test.hpp>
Copied: branches/1.2/cmake/BoostTestTargetsStatic.h (from rev 690, trunk/cmake/BoostTestTargetsStatic.h)
===================================================================
--- branches/1.2/cmake/BoostTestTargetsStatic.h (rev 0)
+++ branches/1.2/cmake/BoostTestTargetsStatic.h 2012-07-04 20:35:57 UTC (rev 693)
@@ -0,0 +1,7 @@
+// Small header computed by CMake to set up boost test.
+// include AFTER #define BOOST_TEST_MODULE whatever
+// but before any other boost test includes.
+
+// Using the Boost UTF static library
+
+#include <boost/test/unit_test.hpp>
Deleted: branches/1.2/cmake/BundleOSGPlugins.cmake
===================================================================
--- trunk/cmake/BundleOSGPlugins.cmake 2012-07-04 20:30:43 UTC (rev 690)
+++ branches/1.2/cmake/BundleOSGPlugins.cmake 2012-07-04 20:35:57 UTC (rev 693)
@@ -1,83 +0,0 @@
-# - Provide access to the OpenSceneGraph runtime files for bundling in
-# an installation or package.
-#
-# Sets these variables:
-# - OSGDB_PLUGINS_RELEASE
-# - OSGDB_PLUGINS_DEBUG
-# - OSGWRAPPER_PLUGINS_RELEASE
-# - OSGWRAPPER_PLUGINS_DEBUG
-# - OSG_RUNTIME_LIBRARY_DIR
-# - OSG_PATH_TO_PLUGINS
-#
-# Creates this function:
-# - install_osg_plugins( {varNameForOutputFilenames} )
-#
-# Requires these CMake modules:
-# no additional modules required
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-
-function(_osgbundle_split_debug_versions releasevar debugvar)
- set(release)
- set(debug)
- foreach(fn ${ARGN})
- get_filename_component(name "${fn}" NAME_WE)
- if(${name} MATCHES "d$")
- list(APPEND debug "${fn}")
- else()
- list(APPEND release "${fn}")
- endif()
- endforeach()
- set(${releasevar} ${release} PARENT_SCOPE)
- set(${debugvar} ${debug} PARENT_SCOPE)
-endfunction()
-
-function(_osgbundle_find_plugins varprefix filenameprefix)
- file(GLOB
- all
- "${OSG_RUNTIME_LIBRARY_DIR}/osgPlugins-${OPENSCENEGRAPH_VERSION}/${filenameprefix}*${CMAKE_SHARED_LIBRARY_SUFFIX}")
- _osgbundle_split_debug_versions(${varprefix}_PLUGINS_RELEASE
- ${varprefix}_PLUGINS_DEBUG
- ${all})
- set(${varprefix}_PLUGINS_RELEASE
- "${${varprefix}_PLUGINS_RELEASE}"
- PARENT_SCOPE)
- set(${varprefix}_PLUGINS_DEBUG
- "${${varprefix}_PLUGINS_DEBUG}"
- PARENT_SCOPE)
-endfunction()
-
-if(OPENSCENEGRAPH_FOUND)
- if(WIN32)
- get_filename_component(_osglibdir "${OSG_LIBRARY}" PATH)
- get_filename_component(_osgroot "${_osglibdir}/.." ABSOLUTE)
- set(OSG_RUNTIME_LIBRARY_DIR "${_osgroot}/bin")
- set(OSG_PATH_TO_PLUGINS "bin/osgPlugins-${OPENSCENEGRAPH_VERSION}/")
- else()
- get_filename_component(_osglibdir "${OSG_LIBRARY}" PATH)
- set(OSG_RUNTIME_LIBRARY_DIR "${_osglibdir}")
- set(OSG_PATH_TO_PLUGINS "lib/osgPlugins-${OPENSCENEGRAPH_VERSION}/")
- endif()
- # Find the osgDB plugins
- _osgbundle_find_plugins(OSGDB osgdb)
- _osgbundle_find_plugins(OSGWRAPPER osgwrapper)
-endif()
-
-function(install_osg_plugins var)
- set(INSTALLEDPLUGINS)
- foreach(plugin ${OSGDB_PLUGINS_RELEASE} ${OSGWRAPPER_PLUGINS_RELEASE})
- install(FILES "${plugin}" DESTINATION "${OSG_PATH_TO_PLUGINS}")
- get_filename_component(name "${plugin}" NAME)
- list(APPEND INSTALLEDPLUGINS "${OSG_PATH_TO_PLUGINS}/${name}")
- endforeach()
- set(${var} ${INSTALLEDPLUGINS} PARENT_SCOPE)
-endfunction()
Copied: branches/1.2/cmake/BundleOSGPlugins.cmake (from rev 690, trunk/cmake/BundleOSGPlugins.cmake)
===================================================================
--- branches/1.2/cmake/BundleOSGPlugins.cmake (rev 0)
+++ branches/1.2/cmake/BundleOSGPlugins.cmake 2012-07-04 20:35:57 UTC (rev 693)
@@ -0,0 +1,83 @@
+# - Provide access to the OpenSceneGraph runtime files for bundling in
+# an installation or package.
+#
+# Sets these variables:
+# - OSGDB_PLUGINS_RELEASE
+# - OSGDB_PLUGINS_DEBUG
+# - OSGWRAPPER_PLUGINS_RELEASE
+# - OSGWRAPPER_PLUGINS_DEBUG
+# - OSG_RUNTIME_LIBRARY_DIR
+# - OSG_PATH_TO_PLUGINS
+#
+# Creates this function:
+# - install_osg_plugins( {varNameForOutputFilenames} )
+#
+# Requires these CMake modules:
+# no additional modules required
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+
+function(_osgbundle_split_debug_versions releasevar debugvar)
+ set(release)
+ set(debug)
+ foreach(fn ${ARGN})
+ get_filename_component(name "${fn}" NAME_WE)
+ if(${name} MATCHES "d$")
+ list(APPEND debug "${fn}")
+ else()
+ list(APPEND release "${fn}")
+ endif()
+ endforeach()
+ set(${releasevar} ${release} PARENT_SCOPE)
+ set(${debugvar} ${debug} PARENT_SCOPE)
+endfunction()
+
+function(_osgbundle_find_plugins varprefix filenameprefix)
+ file(GLOB
+ all
+ "${OSG_RUNTIME_LIBRARY_DIR}/osgPlugins-${OPENSCENEGRAPH_VERSION}/${filenameprefix}*${CMAKE_SHARED_LIBRARY_SUFFIX}")
+ _osgbundle_split_debug_versions(${varprefix}_PLUGINS_RELEASE
+ ${varprefix}_PLUGINS_DEBUG
+ ${all})
+ set(${varprefix}_PLUGINS_RELEASE
+ "${${varprefix}_PLUGINS_RELEASE}"
+ PARENT_SCOPE)
+ set(${varprefix}_PLUGINS_DEBUG
+ "${${varprefix}_PLUGINS_DEBUG}"
+ PARENT_SCOPE)
+endfunction()
+
+if(OPENSCENEGRAPH_FOUND)
+ if(WIN32)
+ get_filename_component(_osglibdir "${OSG_LIBRARY}" PATH)
+ get_filename_component(_osgroot "${_osglibdir}/.." ABSOLUTE)
+ set(OSG_RUNTIME_LIBRARY_DIR "${_osgroot}/bin")
+ set(OSG_PATH_TO_PLUGINS "bin/osgPlugins-${OPENSCENEGRAPH_VERSION}/")
+ else()
+ get_filename_component(_osglibdir "${OSG_LIBRARY}" PATH)
+ set(OSG_RUNTIME_LIBRARY_DIR "${_osglibdir}")
+ set(OSG_PATH_TO_PLUGINS "lib/osgPlugins-${OPENSCENEGRAPH_VERSION}/")
+ endif()
+ # Find the osgDB plugins
+ _osgbundle_find_plugins(OSGDB osgdb)
+ _osgbundle_find_plugins(OSGWRAPPER osgwrapper)
+endif()
+
+function(install_osg_plugins var)
+ set(INSTALLEDPLUGINS)
+ foreach(plugin ${OSGDB_PLUGINS_RELEASE} ${OSGWRAPPER_PLUGINS_RELEASE})
+ install(FILES "${plugin}" DESTINATION "${OSG_PATH_TO_PLUGINS}")
+ get_filename_component(name "${plugin}" NAME)
+ list(APPEND INSTALLEDPLUGINS "${OSG_PATH_TO_PLUGINS}/${name}")
+ endforeach()
+ set(${var} ${INSTALLEDPLUGINS} PARENT_SCOPE)
+endfunction()
Deleted: branches/1.2/cmake/BundleOSGRuntime.cmake
===================================================================
--- trunk/cmake/BundleOSGRuntime.cmake 2012-07-04 20:30:43 UTC (rev 690)
+++ branches/1.2/cmake/BundleOSGRuntime.cmake 2012-07-04 20:35:57 UTC (rev 693)
@@ -1,118 +0,0 @@
-# - Include the OpenSceneGraph runtime files in an installation or built package.
-#
-# OSGRUNTIME_BUNDLE - Set to "yes" to enable this behavior
-# OSGRUNTIME_zlib1dll - Must be set to the location of zlib1.dll on Windows
-# OSGRUNTIME_zlib1ddll - Can be set to the location of zlib1d.dll (debug) on Windows.
-# If set, will be installed.
-#
-# Requires these CMake modules:
-# no additional modules required
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-function(_osgbundle_split_debug_versions releasevar debugvar)
- set(release)
- set(debug)
- foreach(fn ${ARGN})
- get_filename_component(name "${fn}" NAME_WE)
- if(${name} MATCHES "d$")
- list(APPEND debug "${fn}")
- else()
- list(APPEND release "${fn}")
- endif()
- endforeach()
- set(${releasevar} ${release} PARENT_SCOPE)
- set(${debugvar} ${debug} PARENT_SCOPE)
-endfunction()
-
-function(_osgbundle_find_plugins varprefix filenameprefix)
- file(GLOB
- all
- "${OSG_RUNTIME_LIBRARY_DIR}/osgPlugins-${OPENSCENEGRAPH_VERSION}/${filenameprefix}*${CMAKE_SHARED_LIBRARY_SUFFIX}")
- _osgbundle_split_debug_versions(${varprefix}_PLUGINS_RELEASE
- ${va...
[truncated message content] |