Menu
▾
▴
[xml-cppdom-checkins] SF.net SVN: xml-cppdom:[696] branches/1.2
|
From: <pat...@us...> - 2012-07-27 22:30:25
|
Revision: 696
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=696&view=rev
Author: patrickh
Date: 2012-07-27 22:30:15 +0000 (Fri, 27 Jul 2012)
Log Message:
-----------
MFT [r694]: Remove unneeded CMake stuff.
Submitted by: Doug McCorkle
Revision Links:
--------------
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=694&view=rev
Modified Paths:
--------------
branches/1.2/CMakeLists.txt
Removed Paths:
-------------
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/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/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/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/features/SelectLibraryConfigurations.cmake
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/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/FixWinInstallPrefix.cmake
branches/1.2/cmake/cmake-2.8.3-modules/autoinclude.cmake
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/FindBoost.cmake
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/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/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/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/DCubed/CMakeLists.txt
branches/1.2/cmake/nested_targets/DCubed/d3ew_p/CMakeLists.txt
branches/1.2/cmake/nested_targets/DCubed/d3ew_scene/CMakeLists.txt
branches/1.2/cmake/nested_targets/OpenHaptics/CMakeLists.txt
branches/1.2/cmake/nested_targets/Parasolid/CMakeLists.txt
branches/1.2/cmake/nested_targets/cutil/CMakeLists.txt
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/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/mac-alut-framework/AL/alut.h
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/AL/al.h
branches/1.2/cmake/workarounds/mac-openal/AL/alc.h
branches/1.2/cmake/workarounds/tchar/tchar.h
Modified: branches/1.2/CMakeLists.txt
===================================================================
--- branches/1.2/CMakeLists.txt 2012-07-27 22:21:58 UTC (rev 695)
+++ branches/1.2/CMakeLists.txt 2012-07-27 22:30:15 UTC (rev 696)
@@ -3,7 +3,7 @@
# http://academic.cleardefinition.com/
# Iowa State University HCI Graduate Program/VRAC
-cmake_minimum_required(VERSION 2.6.2)
+cmake_minimum_required(VERSION 2.8.8)
# Set package properties
project(cppdom)
@@ -64,7 +64,6 @@
# Perform build configuration of dependencies
###
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
-include(UseBackportedModules)
include(CTest)
find_package(Boost)
Deleted: branches/1.2/cmake/BoostTestTargets.cmake
===================================================================
--- branches/1.2/cmake/BoostTestTargets.cmake 2012-07-27 22:21:58 UTC (rev 695)
+++ branches/1.2/cmake/BoostTestTargets.cmake 2012-07-27 22:30:15 UTC (rev 696)
@@ -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()
Deleted: branches/1.2/cmake/BoostTestTargetsDynamic.h
===================================================================
--- branches/1.2/cmake/BoostTestTargetsDynamic.h 2012-07-27 22:21:58 UTC (rev 695)
+++ branches/1.2/cmake/BoostTestTargetsDynamic.h 2012-07-27 22:30:15 UTC (rev 696)
@@ -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>
-
Deleted: branches/1.2/cmake/BoostTestTargetsIncluded.h
===================================================================
--- branches/1.2/cmake/BoostTestTargetsIncluded.h 2012-07-27 22:21:58 UTC (rev 695)
+++ branches/1.2/cmake/BoostTestTargetsIncluded.h 2012-07-27 22:30:15 UTC (rev 696)
@@ -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>
Deleted: branches/1.2/cmake/BoostTestTargetsStatic.h
===================================================================
--- branches/1.2/cmake/BoostTestTargetsStatic.h 2012-07-27 22:21:58 UTC (rev 695)
+++ branches/1.2/cmake/BoostTestTargetsStatic.h 2012-07-27 22:30:15 UTC (rev 696)
@@ -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>
Deleted: branches/1.2/cmake/BundleOSGPlugins.cmake
===================================================================
--- branches/1.2/cmake/BundleOSGPlugins.cmake 2012-07-27 22:21:58 UTC (rev 695)
+++ branches/1.2/cmake/BundleOSGPlugins.cmake 2012-07-27 22:30:15 UTC (rev 696)
@@ -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()
Deleted: branches/1.2/cmake/BundleOSGRuntime.cmake
===================================================================
--- branches/1.2/cmake/BundleOSGRuntime.cmake 2012-07-27 22:21:58 UTC (rev 695)
+++ branches/1.2/cmake/BundleOSGRuntime.cmake 2012-07-27 22:30:15 UTC (rev 696)
@@ -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
- ${varprefix}_PLUGINS_DEBUG
- ${all})
-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")
- find_file(OSGBUNDLE_zlib1dll
- zlib1.dll
- PATHS
- "${_osgroot}/bin"
- "${_osgroot}/lib")
- find_file(OSGBUNDLE_zlib1ddll
- zlib1d.dll
- PATHS
- "${_osgroot}/bin"
- "${_osgroot}/lib")
- mark_as_advanced(OSGBUNDLE_zlib1dll OSGBUNDLE_zlib1ddll)
- set(_osgbundle_required OSGBUNDLE_zlib1dll)
- set(_osgbundle_platformOK on)
- else()
- get_filename_component(_osglibdir "${OSG_LIBRARY}" PATH)
- set(OSG_RUNTIME_LIBRARY_DIR "${_osglibdir}")
- set(_osgbundle_platformOK on)
- endif()
-
- # Find the osgDB plugins
-
- _osgbundle_find_plugins(OSGDB osgdb)
- _osgbundle_find_plugins(OSGWRAPPER osgwrapper)
-endif()
-
-
-
-if(_osgbundle_platformOK)
- set(_osgbundle_caninstall on)
- foreach(_var ${_osgbundle_required})
- if(NOT ${_var})
- # If we are missing a single required file, cut out now.
- set(_osgbundle_caninstall off)
- option(OSGRUNTIME_BUNDLE
- "Install a local copy of the OpenSceneGraph runtime files with the project."
- off)
- endif()
- endforeach()
- if(_osgbundle_caninstall)
- option(OSGRUNTIME_BUNDLE
- "Install a local copy of the OpenSceneGraph runtime files with the project."
- on)
- endif()
-endif()
-
-mark_as_advanced(OSGRUNTIME_BUNDLE)
-
-if(OSGRUNTIME_BUNDLE AND OPENSCENEGRAPH_FOUND AND _osgbundle_caninstall)
- if(WIN32)
- set(DESTINATION bin)
- install(FILES "${OSGBUNDLE_zlib1dll}"
- DESTINATION ${DESTINATION})
-
- if(OSGBUNDLE_zlib1ddll)
- install(FILES "${OSGBUNDLE_zlib1ddll}"
- DESTINATION ${DESTINATION})
- endif()
-
- else()
- set(DESTINATION lib)
- endif()
-
- install(DIRECTORY "${_osgroot}/bin/" "${_osgroot}/lib/"
- DESTINATION ${DESTINATION}
- FILES_MATCHING
-
- # Runtime files
- PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}")
-endif()
Deleted: branches/1.2/cmake/BundleVRJ22Runtime.cmake
===================================================================
--- branches/1.2/cmake/BundleVRJ22Runtime.cmake 2012-07-27 22:21:58 UTC (rev 695)
+++ branches/1.2/cmake/BundleVRJ22Runtime.cmake 2012-07-27 22:30:15 UTC (rev 696)
@@ -1,99 +0,0 @@
-# - Include the VR Juggler runtime files in an installation or built package.
-#
-# VRJUGGLERRUNTIME_BUNDLE
-# VRJUGGLERRUNTIME_BUNDLE_DEBUG - set to yes to include debug dll's as well
-#
-# Requires these CMake modules:
-# FindVRJuggler22 and its dependencies
-#
-# 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(WIN32)
- option(VRJUGGLERRUNTIME_BUNDLE
- "Install a local copy of the VR Juggler runtime files with the project."
- on)
- option(VRJUGGLERRUNTIME_BUNDLE_DEBUG
- "Install the VR Juggler debug runtime files as well."
- off)
- mark_as_advanced(VRJUGGLERRUNTIME_BUNDLE_DEBUG)
-else()
- # TODO - how to handle when not on Windows?
- #option(VRJUGGLERRUNTIME_BUNDLE "Install a local copy of the VR Juggler runtime files with the project." off)
-endif()
-
-mark_as_advanced(VRJUGGLERRUNTIME_BUNDLE VRJUGGLERRUNTIME_BUNDLE_DEBUG)
-
-if(VRJUGGLERRUNTIME_BUNDLE AND VRJUGGLER22_FOUND)
- if(WIN32)
- get_filename_component(_vrjlibdir "${VRJ22_LIBRARY_RELEASE}" PATH)
- get_filename_component(_vrjroot "${_vrjlibdir}/../" ABSOLUTE)
-
- # TODO - make sure gadgeteer and sonix can find their DSO's at runtime...
-
- foreach(_dir bin lib)
- if(VRJUGGLERRUNTIME_BUNDLE_DEBUG)
- install(DIRECTORY "${_vrjroot}/${_dir}/"
- DESTINATION bin
- PATTERN "*.lib" EXCLUDE # exclude static and link libraries
- PATTERN "*.exe" EXCLUDE # exclude unneeded executables
- PATTERN "*.py" EXCLUDE # exclude unneeded python executables
- PATTERN "*.pyc" EXCLUDE # exclude unneeded python executables
- )
- else()
- install(DIRECTORY ${_vrjroot}/${_dir}/
- DESTINATION bin
- PATTERN "*.lib" EXCLUDE # exclude static and link libraries
- PATTERN "*.exe" EXCLUDE # exclude unneeded executables
- PATTERN "*.py" EXCLUDE # exclude unneeded python executables
- PATTERN "*.pyc" EXCLUDE # exclude unneeded python executables
-
- PATTERN "*d.dll" EXCLUDE # exclude debug dll's
- PATTERN "*-gd-*.dll" EXCLUDE # exclude Boost debug dll's
- )
- endif()
-
- endforeach()
-
- install(DIRECTORY ${_vrjroot}/share/
- DESTINATION share
- FILES_MATCHING
-
- # Runtime files
- PATTERN "*.dll"
- PATTERN "*.jar"
-
- # Data files
- PATTERN "*.wav"
- PATTERN "*.xml"
- PATTERN "*.xsl"
- PATTERN "*.xsd"
- PATTERN "*.flt"
- PATTERN "*.dat"
- PATTERN "*.table"
-
-
- # Config files
- PATTERN "*.jdef"
- PATTERN "*.jconf"
- PATTERN "*.cfg"
- PATTERN "hosts.allow"
-
- # Other Files
- PATTERN "*.txt"
- PATTERN "COPYING*"
- PATTERN "ChangeLog"
- )
-
- endif()
-
-
-
-endif()
Deleted: branches/1.2/cmake/BundleVRJ30Runtime.cmake
===================================================================
--- branches/1.2/cmake/BundleVRJ30Runtime.cmake 2012-07-27 22:21:58 UTC (rev 695)
+++ branches/1.2/cmake/BundleVRJ30Runtime.cmake 2012-07-27 22:30:15 UTC (rev 696)
@@ -1,96 +0,0 @@
-# - Include the VR Juggler runtime files in an installation or built package.
-#
-# VRJUGGLERRUNTIME_BUNDLE
-# VRJUGGLERRUNTIME_BUNDLE_DEBUG - set to yes to include debug dll's as well
-#
-# Requires these CMake modules:
-# FindVRJuggler22 and its dependencies
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-# Updated for VR Juggler 3.0 by:
-# Brandon Newendorp <br...@ne...>
-
-if(WIN32)
- option(VRJUGGLERRUNTIME_BUNDLE
- "Install a local copy of the VR Juggler runtime files with the project."
- on)
- option(VRJUGGLERRUNTIME_BUNDLE_DEBUG
- "Install the VR Juggler debug runtime files as well."
- off)
- mark_as_advanced(VRJUGGLERRUNTIME_BUNDLE_DEBUG)
-else()
- # TODO - how to handle when not on Windows?
- #option(VRJUGGLERRUNTIME_BUNDLE "Install a local copy of the VR Juggler runtime files with the project." off)
-endif()
-
-mark_as_advanced(VRJUGGLERRUNTIME_BUNDLE VRJUGGLERRUNTIME_BUNDLE_DEBUG)
-
-if(VRJUGGLERRUNTIME_BUNDLE AND VRJUGGLER22_FOUND)
- if(WIN32)
- get_filename_component(_vrjlibdir "${VRJ22_LIBRARY_RELEASE}" PATH)
- get_filename_component(_vrjroot "${_vrjlibdir}/../" ABSOLUTE)
-
- # TODO - make sure gadgeteer and sonix can find their DSO's at runtime...
-
- foreach(_dir bin lib)
- if(VRJUGGLERRUNTIME_BUNDLE_DEBUG)
- install(DIRECTORY "${_vrjroot}/${_dir}/"
- DESTINATION bin
- PATTERN "*.lib" EXCLUDE # exclude static and link libraries
- PATTERN "*.exe" EXCLUDE # exclude unneeded executables
- PATTERN "*.py" EXCLUDE # exclude unneeded python executables
- PATTERN "*.pyc" EXCLUDE # exclude unneeded python executables
- )
- else()
- install(DIRECTORY ${_vrjroot}/${_dir}/
- DESTINATION bin
- PATTERN "*.lib" EXCLUDE # exclude static and link libraries
- PATTERN "*.exe" EXCLUDE # exclude unneeded executables
- PATTERN "*.py" EXCLUDE # exclude unneeded python executables
- PATTERN "*.pyc" EXCLUDE # exclude unneeded python executables
-
- PATTERN "*d.dll" EXCLUDE # exclude debug dll's
- PATTERN "*-gd-*.dll" EXCLUDE # exclude Boost debug dll's
- )
- endif()
-
- endforeach()
-
- install(DIRECTORY ${_vrjroot}/share/
- DESTINATION share
- FILES_MATCHING
-
- # Runtime files
- PATTERN "*.dll"
- PATTERN "*.jar"
-
- # Data files
- PATTERN "*.wav"
- PATTERN "*.xml"
- PATTERN "*.xsl"
- PATTERN "*.xsd"
- PATTERN "*.flt"
- PATTERN "*.dat"
- PATTERN "*.table"
-
-
- # Config files
- PATTERN "*.jdef"
- PATTERN "*.jconf"
- PATTERN "*.cfg"
- PATTERN "hosts.allow"
-
- # Other Files
- PATTERN "*.txt"
- PATTERN "COPYING*"
- PATTERN "ChangeLog"
- )
-
- endif()
-
-
-
-endif()
Deleted: branches/1.2/cmake/CheckMacHIDAPI.cmake
===================================================================
--- branches/1.2/cmake/CheckMacHIDAPI.cmake 2012-07-27 22:21:58 UTC (rev 695)
+++ branches/1.2/cmake/CheckMacHIDAPI.cmake 2012-07-27 22:30:15 UTC (rev 696)
@@ -1,73 +0,0 @@
-# - Script to check if the signature for a mac HID callback uses UInt32 or uint32_t
-# Requires that the associated CPP file be present: CheckMacHIDAPI.cpp.
-#
-# MACOSX_HID_UINT32T, set according to the results of our test.
-#
-# 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 <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(APPLE)
- if(NOT MACOSX_HID_UINT32T)
- get_filename_component(_moddir ${CMAKE_CURRENT_LIST_FILE} PATH)
-
- try_compile(_HID_uint32t
- ${CMAKE_BINARY_DIR}
- ${_moddir}/CheckMacHIDAPI.cpp
- OUTPUT_VARIABLE
- _HID_uint32t_OUTPUT
- COMPILE_DEFINITIONS
- -DMACOSX_HID_UINT32T=uint32_t)
- message(STATUS
- "Checking uint32_t in HID callback signature... ${_HID_uint32t}")
-
- try_compile(_HID_UInt32
- ${CMAKE_BINARY_DIR}
- ${_moddir}/CheckMacHIDAPI.cpp
- OUTPUT_VARIABLE
- _HID_UInt32_OUTPUT
- COMPILE_DEFINITIONS
- -DMACOSX_HID_UINT32T=UInt32)
- message(STATUS
- "Checking UInt32 in HID callback signature... ${_HID_UInt32}")
-
-
- if(_HID_uint32t)
- set(MACOSX_HID_UINT32T
- "uint32_t"
- CACHE
- STRING
- "The 32-bit uint type desired in the callback set by setInterruptReportHandlerCallback")
- mark_as_advanced(MACOSX_HID_UINT32T)
- elseif(_HID_UInt32)
- set(MACOSX_HID_UINT32T
- "UInt32"
- CACHE
- STRING
- "The 32-bit uint type desired in the callback set by setInterruptReportHandlerCallback")
- mark_as_advanced(MACOSX_HID_UINT32T)
- else()
- message(SEND_ERROR
- "ERROR: Could not detect appropriate Mac HID uint32 type!")
- endif()
-
- endif()
-endif()
Deleted: branches/1.2/cmake/CheckMacHIDAPI.cpp
===================================================================
--- branches/1.2/cmake/CheckMacHIDAPI.cpp 2012-07-27 22:21:58 UTC (rev 695)
+++ branches/1.2/cmake/CheckMacHIDAPI.cpp 2012-07-27 22:30:15 UTC (rev 696)
@@ -1,47 +0,0 @@
-/**
- * \file CheckMacHIDAPI.cpp
- * \brief C++ source file used by CMake module CheckMacHIDAPI.cmake
- *
- * \author
- * Ryan Pavlik, 2009-2010
- * <rp...@ia...>
- * http://academic.cleardefinition.com/
- *
- * \author
- * Based on code extracted from VRPN 07.22 for use as a minimal test case
- *
- * Attempts to compile a difficult bit of code against the Mac
- * HID API, as two different types have been required in the callback
- * function (UInt32 and uint32_t) and testing is the best way to know
- * which one is correct for a given system.
- *
- */
-
-
-#if defined(__APPLE__)
-
-#include <stdio.h>
-#include <IOKit/IOCFPlugIn.h>
-#include <IOKit/hid/IOHIDLib.h>
-#include <IOKit/hid/IOHIDKeys.h>
-#include <CoreFoundation/CoreFoundation.h>
-void ReaderReportCallback(
- void *target, IOReturn result, void *refcon, void *sender, MACOSX_HID_UINT32T size
- )
- {}
-#endif
-
-int main(int argc, char* argv[]) {
-#if defined(__APPLE__)
- io_object_t _ioObject;
- IOHIDDeviceInterface122 **_interface;
- bool _gotdata;
- int _gotsize;
- unsigned char _buffer[512];
- IOReturn result = (*_interface)->setInterruptReportHandlerCallback(_interface,
- _buffer, 512,
- ReaderReportCallback,
- NULL, 0);
-#endif
- return 0;
-}
Deleted: branches/1.2/cmake/CheckVersion.cmake
===================================================================
--- branches/1.2/cmake/CheckVersion.cmake 2012-07-27 22:21:58 UTC (rev 695)
+++ branches/1.2/cmake/CheckVersion.cmake 2012-07-27 22:30:15 UTC (rev 696)
@@ -1,47 +0,0 @@
-# - Utility function for Find modules considering multiple possible versions
-#
-# 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)
-
-if(__check_version)
- return()
-endif()
-set(__check_version YES)
-
-function(check_version var packagename version)
- # By default, we say that the version is good enough
- set(_result TRUE)
-
- # Was a version requested? If so, what is our test condition?
- if(${packagename}_FIND_VERSION)
- if(${packagename}_FIND_VERSION_EXACT)
- # Yes, an exact == version was requested - check it.
-
- if(NOT "${version}" VERSION_EQUAL "${${packagename}_FIND_VERSION}")
- # version is not an exact match
- set(_result FALSE)
- endif()
- else()
- # Yes, a minimum >= version was requested - check it.
-
- if("${version}" VERSION_LESS "${${packagename}_FIND_VERSION}")
- # version is lower than requested
- set(_result FALSE)
- endif()
-
- endif()
- endif()
-
- # Return _result
- set(${var} ${_result} PARENT_SCOPE)
-endfunction()
Deleted: branches/1.2/cmake/CleanDirectoryList.cmake
===================================================================
--- branches/1.2/cmake/CleanDirectoryList.cmake 2012-07-27 22:21:58 UTC (rev 695)
+++ branches/1.2/cmake/CleanDirectoryList.cmake 2012-07-27 22:30:15 UTC (rev 696)
@@ -1,48 +0,0 @@
-# - Removes duplicate entries and non-directories from a provided list
-#
-# clean_directory_list(<listvar> [<additional list items>...])
-#
-# Requires CMake 2.6 or newer (uses the 'function' command)
-#
-# 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(__clean_directory_list)
- return()
-endif()
-set(__clean_directory_list YES)
-
-function(clean_directory_list _var)
- # combine variable's current value with additional list items
- set(_in ${${_var}} ${ARGN})
-
- if(_in)
- # Initial list cleaning
- list(REMOVE_DUPLICATES _in)
-
- # Grab the absolute path of each actual directory
- set(_out)
- foreach(_dir ${_in})
- if(IS_DIRECTORY "${_dir}")
- get_filename_component(_dir "${_dir}" ABSOLUTE)
- file(TO_CMAKE_PATH "${_dir}" _dir)
- list(APPEND _out "${_dir}")
- endif()
- endforeach()
-
- if(_out)
- # Clean up the output list now
- list(REMOVE_DUPLICATES _out)
- endif()
-
- # return _out
- set(${_var} "${_out}" PARENT_SCOPE)
- endif()
-endfunction()
Deleted: branches/1.2/cmake/CleanLibraryList.cmake
===================================================================
--- branches/1.2/cmake/CleanLibraryList.cmake 2012-07-27 22:21:58 UTC (rev 695)
+++ branches/1.2/cmake/CleanLibraryList.cmake 2012-07-27 22:30:15 UTC (rev 696)
@@ -1,72 +0,0 @@
-# - A smarter replacement for list(REMOVE_DUPLICATES) for library lists
-#
-# Note that, in the case of cyclic link dependencies, you _do_ actually need
-# a library in a list multiple times. So, only use this function when you know
-# that the dependency graph is acyclic.
-#
-# clean_library_list(<listvar> [<additional list items>...]) - where
-# listvar is the name of a destination variable, and also possibly a source, and
-# it is followed by any number (including 0) of additional libraries to append
-# to the list before processing.
-#
-# 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 <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(__clean_library_list)
- return()
-endif()
-set(__clean_library_list YES)
-
-function(clean_library_list _var)
- # combine variable's current value with additional list items
- set(_work ${${_var}} ${ARGN})
- if(_work)
- # Turn each of optimized, debug, and general into flags
- # prefixed on their respective library (combining list items)
- string(REGEX REPLACE "optimized;" "1CLL%O%" _work "${_work}")
- string(REGEX REPLACE "debug;" "1CLL%D%" _work "${_work}")
- string(REGEX REPLACE "general;" "1CLL%G%" _work "${_work}")
-
- # Any library that doesn't have a prefix is general, and a general
- # library is both debug and optimized so stdize it
- set(_std)
- foreach(_lib ${_work})
- if(NOT "${_lib}" MATCHES "^1CLL%.%")
- list(APPEND _std "1CLL%D%${_lib}" "1CLL%O%${_lib}")
- elseif("${_lib}" MATCHES "^1CLL%G%")
- string(REPLACE "1CLL%G%" "" _justlib "${_lib}")
- list(APPEND _std "1CLL%D%${_justlib}" "1CLL%O%${_justlib}")
- else()
- list(APPEND _std "${_lib}")
- endif()
- endforeach()
-
- # REMOVE_DUPLICATES leaves the first - so we reverse before and after
- # to keep the last, instead
- list(REVERSE _std)
- list(REMOVE_DUPLICATES _std)
- list(REVERSE _std)
-
- # Split list items back out again: turn prefixes into the
- # library type flags.
- string(REGEX REPLACE "1CLL%D%" "debug;" _std "${_std}")
- string(REGEX REPLACE "1CLL%O%" "optimized;" _std "${_std}")
-
- # Return _std
- set(${_var} ${_std} PARENT_SCOPE)
- endif()
-endfunction()
Deleted: branches/1.2/cmake/CppcheckTargets.cmake
===================================================================
--- branches/1.2/cmake/CppcheckTargets.cmake 2012-07-27 22:21:58 UTC (rev 695)
+++ branches/1.2/cmake/CppcheckTargets.cmake 2012-07-27 22:30:15 UTC (rev 696)
@@ -1,213 +0,0 @@
-# - Run cppcheck on c++ source files as a custom target and a test
-#
-# include(CppcheckTargets)
-# add_cppcheck(<target-name> [UNUSED_FUNCTIONS] [STYLE] [POSSIBLE_ERROR] [FAIL_ON_WARNINGS]) -
-# Create a target to check a target's sources with cppcheck and the indicated options
-# add_cppcheck_sources(<target-name> [UNUSED_FUNCTIONS] [STYLE] [POSSIBLE_ERROR] [FAIL_ON_WARNINGS]) -
-# Create a target to check standalone sources with cppcheck and the indicated options
-#
-# Requires these CMake modules:
-# Findcppcheck
-#
-# Requires CMake 2.6 or newer (uses the 'function' command)
-#
-# 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_cppcheck)
- return()
-endif()
-set(__add_cppcheck YES)
-
-if(NOT CPPCHECK_FOUND)
- find_package(cppcheck QUIET)
-endif()
-
-if(CPPCHECK_FOUND)
- if(NOT TARGET all_cppcheck)
- add_custom_target(all_cppcheck)
- set_target_properties(all_cppcheck PROPERTIES EXCLUDE_FROM_ALL TRUE)
- endif()
-endif()
-
-function(add_cppcheck_sources _targetname)
- if(CPPCHECK_FOUND)
- set(_cppcheck_args)
- set(_input ${ARGN})
- list(FIND _input UNUSED_FUNCTIONS _unused_func)
- if("${_unused_func}" GREATER "-1")
- list(APPEND _cppcheck_args ${CPPCHECK_UNUSEDFUNC_ARG})
- list(REMOVE_AT _input ${_unused_func})
- endif()
-
- list(FIND _input STYLE _style)
- if("${_style}" GREATER "-1")
- list(APPEND _cppcheck_args ${CPPCHECK_STYLE_ARG})
- list(REMOVE_AT _input ${_style})
- endif()
-
- list(FIND _input POSSIBLE_ERROR _poss_err)
- if("${_poss_err}" GREATER "-1")
- list(APPEND _cppcheck_args ${CPPCHECK_POSSIBLEERROR_ARG})
- list(REMOVE_AT _input ${_poss_err})
- endif()
-
- list(FIND _input FAIL_ON_WARNINGS _fail_on_warn)
- if("${_fail_on_warn}" GREATER "-1")
- list(APPEND
- CPPCHECK_FAIL_REGULAR_EXPRESSION
- ${CPPCHECK_WARN_REGULAR_EXPRESSION})
- list(REMOVE_AT _input ${_fail_on_warn})
- endif()
-
- set(_files)
- foreach(_source ${_input})
- get_source_file_property(_cppcheck_loc "${_source}" LOCATION)
- if(_cppcheck_loc)
- # This file has a source file property, carry on.
- get_source_file_property(_cppcheck_lang "${_source}" LANGUAGE)
- if("${_cppcheck_lang}" MATCHES "CXX")
- list(APPEND _files "${_cppcheck_loc}")
- endif()
- else()
- # This file doesn't have source file properties - figure it out.
- get_filename_component(_cppcheck_loc "${_source}" ABSOLUTE)
- if(EXISTS "${_cppcheck_loc}")
- list(APPEND _files "${_cppcheck_loc}")
- else()
- message(FATAL_ERROR
- "Adding CPPCHECK for file target ${_targetname}: "
- "File ${_source} does not exist or needs a corrected path location "
- "since we think its absolute path is ${_cppcheck_loc}")
- endif()
- endif()
- endforeach()
-
- if("1.${CMAKE_VERSION}" VERSION_LESS "1.2.8.0")
- # Older than CMake 2.8.0
- add_test(${_targetname}_cppcheck_test
- "${CPPCHECK_EXECUTABLE}"
- ${CPPCHECK_TEMPLATE_ARG}
- ${_cppcheck_args}
- ${_files})
- else()
- # CMake 2.8.0 and newer
- add_test(NAME
- ${_targetname}_cppcheck_test
- COMMAND
- "${CPPCHECK_EXECUTABLE}"
- ${CPPCHECK_TEMPLATE_ARG}
- ${_cppcheck_args}
- ${_files})
- endif()
-
- set_tests_properties(${_targetname}_cppcheck_test
- PROPERTIES
- FAIL_REGULAR_EXPRESSION
- "${CPPCHECK_FAIL_REGULAR_EXPRESSION}")
-
- add_custom_command(TARGET
- all_cppcheck
- PRE_BUILD
- COMMAND
- ${CPPCHECK_EXECUTABLE}
- ${CPPCHECK_QUIET_ARG}
- ${CPPCHECK_TEMPLATE_ARG}
- ${_cppcheck_args}
- ${_files}
- WORKING_DIRECTORY
- "${CMAKE_CURRENT_SOURCE_DIR}"
- COMMENT
- "${_targetname}_cppcheck: Running cppcheck on target ${_targetname}..."
- VERBATIM)
- endif()
-endfunction()
-
-function(add_cppcheck _name)
- if(NOT TARGET ${_name})
- message(FATAL_ERROR
- "add_cppcheck given a target name that does not exist: '${_name}' !")
- endif()
- if(CPPCHECK_FOUND)
- set(_cppcheck_args)
-
- list(FIND ARGN UNUSED_FUNCTIONS _unused_func)
- if("${_unused_func}" GREATER "-1")
- list(APPEND _cppcheck_args ${CPPCHECK_UNUSEDFUNC_ARG})
- endif()
-
- list(FIND ARGN STYLE _style)
- if("${_style}" GREATER "-1")
- list(APPEND _cppcheck_args ${CPPCHECK_STYLE_ARG})
- endif()
-
- list(FIND ARGN POSSIBLE_ERROR _poss_err)
- if("${_poss_err}" GREATER "-1")
- list(APPEND _cppcheck_args ${CPPCHECK_POSSIBLEERROR_ARG})
- endif()
-
- list(FIND _input FAIL_ON_WARNINGS _fail_on_warn)
- if("${_fail_on_warn}" GREATER "-1")
- list(APPEND
- CPPCHECK_FAIL_REGULAR_EXPRESSION
- ${CPPCHECK_WARN_REGULAR_EXPRESSION})
- list(REMOVE_AT _input ${_unused_func})
- endif()
-
- get_target_property(_cppcheck_sources "${_name}" SOURCES)
- set(_files)
- foreach(_source ${_cppcheck_sources})
- get_source_file_property(_cppcheck_lang "${_source}" LANGUAGE)
- get_source_file_property(_cppcheck_loc "${_source}" LOCATION)
- if("${_cppcheck_lang}" MATCHES "CXX")
- list(APPEND _files "${_cppcheck_loc}")
- endif()
- endforeach()
-
- if("1.${CMAKE_VERSION}" VERSION_LESS "1.2.8.0")
- # Older than CMake 2.8.0
- add_test(${_name}_cppcheck_test
- "${CPPCHECK_EXECUTABLE}"
- ${CPPCHECK_TEMPLATE_ARG}
- ${_cppcheck_args}
- ${_files})
- else()
- # CMake 2.8.0 and newer
- add_test(NAME
- ${_name}_cppcheck_test
- COMMAND
- "${CPPCHECK_EXECUTABLE}"
- ${CPPCHECK_TEMPLATE_ARG}
- ${_cppcheck_args}
- ${_files})
- endif()
-
- set_tests_properties(${_name}_cppcheck_test
- PROPERTIES
- FAIL_REGULAR_EXPRESSION
- "${CPPCHECK_FAIL_REGULAR_EXPRESSION}")
-
- add_custom_command(TARGET
- all_cppcheck
- PRE_BUILD
- COMMAND
- ${CPPCHECK_EXECUTABLE}
- ${CPPCHECK_QUIET_ARG}
- ${CPPCHECK_TEMPLATE_ARG}
- ${_cppcheck_args}
- ${_files}
- WORKING_DIRECTORY
- "${CMAKE_CURRENT_SOURCE_DIR}"
- COMMENT
- "${_name}_cppcheck: Running cppcheck on target ${_name}..."
- VERBATIM)
- endif()
-
-endfunction()
Deleted: branches/1.2/cmake/CreateDashboardScripts.cmake
===================================================================
--- branches/1.2/cmake/CreateDashboardScripts.cmake 2012-07-27 22:21:58 UTC (rev 695)
+++ branches/1.2/cmake/CreateDashboardScripts.cmake 2012-07-27 22:30:15 UTC (rev 696)
@@ -1,196 +0,0 @@
-# - Create ctest -S scripts to use to run dashboard builds
-#
-# include(CreateDashboardScripts)
-# create_dashboard_scripts([<initialcachetemplatefilename>])
-#
-# If you need additional settings to persist from the "parent" CMake instance
-# to the initial cache created by the dashboard script,
-# you may pass a filename which will be configured into the initial cache.
-#
-# In the resulting DASHBOARDSCRIPT_BASE_DIRECTORY, an end-user
-# may optionally create a file named
-# CustomInitialCache.${DASHBOARDSCRIPT_SCRIPT_NAME}
-# (by default, CustomInitialCache.go.cmake) containing set commands that use
-# the CACHE option, to set up additional site-local cache variable values.
-#
-# Requires these CMake modules:
-# GetCompilerInfoString
-#
-# Requires CMake 2.6 or newer (uses the 'function' command)
-#
-# 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)
-
-# Only do any of the prep work if not already in a dashboard script
-if(NOT IN_DASHBOARD_SCRIPT)
-
- # Hide a CTest variable
- mark_as_advanced(DART_TESTING_TIMEOUT)
-
- include(GetCompilerInfoString)
-
- get_compiler_info_string(_COMPILERID)
-
- # 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(_dashboardmoddir
- ${CMAKE_CURRENT_LIST_FILE}
- PATH)
-
- if(NOT "$ENV{USER}" MATCHES "^$")
- set(_user "$ENV{USER}")
- elseif(NOT "$ENV{USERNAME}" MATCHES "^$")
- set(_user "$ENV{USERNAME}")
- endif()
-
- if(NOT _dashboardscript_machine)
- if(NOT SITE)
- site_name(SITE)
- endif()
- set(_dashboardscript_machine "${SITE}" CACHE INTERNAL "")
- set(SITE
- "${_user}@${_dashboardscript_machine}"
- CACHE
- STRING
- "Human-readable site name"
- FORCE)
- endif()
-
- set(DASHBOARDSCRIPT_BASE_DIRECTORY
- "${CMAKE_BINARY_DIR}/Dashboards-${_dashboardscript_machine}-${_user}"
- CACHE
- PATH
- "Directory to use as the root of all dashboard work")
- mark_as_advanced(DASHBOARDSCRIPT_BASE_DIRECTORY)
-
- set(DASHBOARDSCRIPT_SOURCE_DIRECTORY "${CMAKE_SOURCE_DIR}")
-
- set(BUILDNAME
- "${CMAKE_SYSTEM}-${CMAKE_SYSTEM_PROCESSOR}-${_COMPILERID}"
- CACHE
- STRING
- "Human-readable build ID info")
-
- set(DASHBOARDSCRIPT_CMAKE_COMMAND
- "${CMAKE_COMMAND}"
- CACHE
- FILEPATH
- "The cmake binary to use when configuring a dashboard build")
- mark_as_advanced(DASHBOARDSCRIPT_CMAKE_COMMAND)
-
- # Try to find CTest, preferably right next to the chosen CMake
- if(DASHBOARDSCRIPT_CMAKE_COMMAND)
- get_filename_component(_cmake_dir
- ${DASHBOARDSCRIPT_CMAKE_COMMAND}
- PATH)
- else()
- get_filename_component(_cmake_dir ${CMAKE_COMMAND} PATH)
- endif()
- find_program(DASHBOARDSCRIPT_CTEST_EXECUTABLE
- NAMES
- ctest
- HINTS
- "${_cmake_dir}"
- NO_DEFAULT_PATH)
- find_program(DASHBOARDSCRIPT_CTEST_EXECUTABLE
- NAMES
- ctest
- HINTS
- "${_cmake_dir}")
-
-
- set(DASHBOARDSCRIPT_CTEST_EXECUTABLE
- "${DASHBOARDSCRIPT_CTEST_EXECUTABLE}"
- CACHE
- FILEPATH
- "Path to the CTest executable to use for dashboard builds.")
- mark_as_advanced(DASHBOARDSCRIPT_CTEST_EXECUTABLE)
-
-
- # Optionals
-
- if(NOT "1.${CMAKE_VERSION}" VERSION_LESS "1.2.8.0")
- if(IS_DIRECTORY "${CMAKE_SOURCE_DIRECTORY}/.git")
- find_program(DASHBOARDSCRIPT_GIT_EXECUTABLE NAMES git git.cmd)
- if(DASHBOARDSCRIPT_GIT_EXECUTABLE)
-
- set(UPDATE_TYPE "git")
- set(UPDATE_COMMAND "${DASHBOARDSCRIPT_GIT_EXECUTABLE}")
- set(UPDATE_OPTIONS "")
- mark_as_advanced(DASHBOARDSCRIPT_GIT_EXECUTABLE)
- endif()
- endif()
- endif()
-
-else()
- # IN_DASHBOARD_SCRIPT is YES
- message(STATUS
- "CreateDashboardScripts detected that we're in a dashboard script already.")
-endif()
-
-function(create_dashboard_scripts)
- # Only create the script if we have all the required variables
- # and are not already in it, and are at least 2.8.0.
- if(DASHBOARDSCRIPT_BASE_DIRECTORY AND
- DASHBOARDSCRIPT_SOURCE_DIRECTORY AND
- DASHBOARDSCRIPT_BASE_DIRECTORY AND
- BUILDNAME AND
- DASHBOARDSCRIPT_CMAKE_COMMAND AND
- DASHBOARDSCRIPT_CTEST_EXECUTABLE AND
- NOT IN_DASHBOARD_SCRIPT AND
- NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.0")
-
- set(_Continuous_cron "15 * * * * ")
- set(_Nightly_cron "15 0 * * * ")
- set(_Experimental_cron
- "\nor run this command for an one-off experimental test build:\n")
- set(_Experimental_flags "-VV")
-
- message(STATUS
- "Dashboard scripts have been generated for automatic nightly and continuous builds.")
- if(WIN32)
- set(_Continuous_cron)
- set(_Nightly_cron)
- message(STATUS
- "You can set up scheduled tasks to run these command lines:")
- else()
- message(STATUS "You can add these sample lines to your crontab:")
- endif()
-
- set(_msg)
-
- if(NOT DASHBOARDSCRIPT_BUILD_CONFIGURATION)
- set(DASHBOARDSCRIPT_BUILD_CONFIGURATION "RelWithDebInfo")
- endif()
- set(DASHBOARDSCRIPT_BUILD_CONFIGURATION "${DASHBOARDSCRIPT_BUILD_CONFIGURATION}" CACHE STRING "Build configuration to use for dashboard builds by default")
- mark_as_advanced(DASHBOARDSCRIPT_BUILD_CONFIGURATION)
-
- foreach(DASHBOARDSCRIPT_DASH_TYPE Nightly Continuous Experimental)
- # If given a cache template, configure it
- if(ARGN)
- configure_file(${ARGN}
- "${DASHBOARDSCRIPT_BASE_DIRECTORY}/GeneratedInitialCache.run${DASHBOARDSCRIPT_DASH_TYPE}.cmake"
- @ONLY)
- endif()
-
- # Actually create the script file
- configure_file(${_dashboardmoddir}/DashboardScript.cmake.in
- "${DASHBOARDSCRIPT_BASE_DIRECTORY}/run${DASHBOARDSCRIPT_DASH_TYPE}.cmake"
- @ONLY)
-
- set(_msg
- "${_msg}\n${_${DASHBOARDSCRIPT_DASH_TYPE}_cron}\"${DASHBOARDSCRIPT_CTEST_EXECUTABLE}\" -S \"${DASHBOARDSCRIPT_BASE_DIRECTORY}/run${DASHBOARDSCRIPT_DASH_TYPE}.cmake\" ${_${DASHBOARDSCRIPT_DASH_TYPE}_flags}")
-
- endforeach()
- message(STATUS "\n${_msg}\n")
- message(STATUS "")
-
- endif()
-endfunction()
Deleted: branches/1.2/cmake/CreateImportedTarget.cmake
===================================================================
--- branches/1.2/cmake/CreateImportedTarget.cmake 2012-07-27 22:21:58 UTC (rev 695)
+++ branches/1.2/cmake/CreateImportedTarget.cmake 2012-07-27 22:30:15 UTC (rev 696)
@@ -1,64 +0,0 @@
-# - A smarter replacement for list(REMOVE_DUPLICATES) for library lists
-#
-# create_imported_target(<libname> [SHARED|STATIC|MODULE] [<library dependency>...]) - where
-# ${libname}_LIBRARIES is set to this library's paths.
-#
-# 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 <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(__create_imported_target)
- return()
-endif()
-set(__create_imported_target YES)
-
-function(create_imported_target _libname)
- if(ARGN)
- list(FIND ARGN SHARED _target_shared)
- list(FIND ARGN STATIC _target_static)
- list(FIND ARGN MODULE _target_module)
-
- if(${_target_shared} GREATER -1)
- set(_target_type SHARED)
- elseif(${_target_static} GREATER -1)
- set(_target_type STATIC)
- elseif(${_target_module} GREATER -1)
- set(_target_type MODULE)
- else()
- set(_target_type UNKNOWN)
- endif()
-
- set(_deps ${ARGN})
- list(REMOVE_ITEM _deps SHARED STATIC MODULE UNKNOWN)
- else()
- set(_target_type UNKNOWN)
- set(_deps)
- endif()
-
- if(${_libname}_LIBRARIES AND NOT TARGET ${_libname}_imported)
- add_library(${_libname}_imported ${_target_type} IMPORTED)
- #message(STATUS "Library ${_libname}: lib ${${_libname}_LIBRARIES}")
- #message(STATUS "Deps: ${_deps}")
- set_target_properties(${_libname}_imported
- PROPERTIES
- IMPORTED_LOCATION
- "${${_libname}_LIBRARIES}"
- IMPORTED_LINK_INTERFACE_LIBRARIES
- "${_deps}")
- endif()
-
- if(TARGET ${_libname}_imported)
- set(${_libname}_LIBRARIES ${_libname}_imported PARENT_SCOPE)
- endif()
-endfunction()
Deleted: bra...
[truncated message content] |
