Revision: 7245
http://playerstage.svn.sourceforge.net/playerstage/?rev=7245&view=rev
Author: gbiggs
Date: 2009-01-05 05:00:40 +0000 (Mon, 05 Jan 2009)
Log Message:
-----------
Added library checks to eedhcontroller driver.
Modified Paths:
--------------
code/player/trunk/cmake/internal/DriverUtils.cmake
code/player/trunk/server/drivers/limb/CMakeLists.txt
code/player/trunk/server/drivers/limb/eeDHcontroller.cc
Modified: code/player/trunk/cmake/internal/DriverUtils.cmake
===================================================================
--- code/player/trunk/cmake/internal/DriverUtils.cmake 2009-01-05 03:55:24 UTC
(rev 7244)
+++ code/player/trunk/cmake/internal/DriverUtils.cmake 2009-01-05 05:00:40 UTC
(rev 7245)
@@ -304,7 +304,7 @@
###############################################################################
# PLAYERDRIVER_REQUIRE_LIB (_name _cumulativeVar _library _function _path)
-# Check if a required package is available.
+# Check if a required library is available.
#
# _name: Driver name.
# _cumulativeVar: The option used in the calling CMakeLists.txt to check if
@@ -315,6 +315,11 @@
INCLUDE (CheckLibraryExists)
MACRO (PLAYERDRIVER_REQUIRE_LIB _name _cumulativeVar _library _function _path)
SET (foundLibrary)
+ IF (PLAYER_EXTRA_LIB_DIRS AND NOT _path)
+ SET (_path "${PLAYER_EXTRA_LIB_DIRS}")
+ ELSEIF (NOT PLAYER_EXTRA_LIB_DIRS AND NOT _path)
+ SET (_path ".")
+ ENDIF (PLAYER_EXTRA_LIB_DIRS AND NOT _path)
CHECK_LIBRARY_EXISTS ("${_library}" "${_function}" "${_path}" foundLibrary)
# If not found, disable this driver
# Dereference cumulativeVar only once because IF will dereference the
variable name stored inside itself
Modified: code/player/trunk/server/drivers/limb/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/limb/CMakeLists.txt 2009-01-05
03:55:24 UTC (rev 7244)
+++ code/player/trunk/server/drivers/limb/CMakeLists.txt 2009-01-05
05:00:40 UTC (rev 7245)
@@ -1,2 +1,4 @@
PLAYERDRIVER_OPTION (eedhcontroller build_eedhcontroller OFF "Disabled -
probably doesn't build")
+PLAYERDRIVER_REQUIRE_LIB (eedhcontroller build_eedhcontroller roboop main "")
+PLAYERDRIVER_REQUIRE_LIB (eedhcontroller build_eedhcontroller newmat main "")
PLAYERDRIVER_ADD_DRIVER (eedhcontroller build_eedhcontroller SOURCES
eeDHcontroller.cc)
Modified: code/player/trunk/server/drivers/limb/eeDHcontroller.cc
===================================================================
--- code/player/trunk/server/drivers/limb/eeDHcontroller.cc 2009-01-05
03:55:24 UTC (rev 7244)
+++ code/player/trunk/server/drivers/limb/eeDHcontroller.cc 2009-01-05
05:00:40 UTC (rev 7245)
@@ -217,7 +217,7 @@
void
eedhcontroller_Register (DriverTable* table)
{
- table->AddDriver ("eeDHcontroller", EEDHController_Init);
+ table->AddDriver ("eedhcontroller", eedhcontroller_Init);
}
////////////////////////////////////////////////////////////////////////////////
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
