Revision: 8458
http://playerstage.svn.sourceforge.net/playerstage/?rev=8458&view=rev
Author: gbiggs
Date: 2009-12-15 01:05:05 +0000 (Tue, 15 Dec 2009)
Log Message:
-----------
Fixed XSensMT. Fixed incorrect checking of pkg-config versions.
Modified Paths:
--------------
code/player/trunk/cmake/internal/DriverUtils.cmake
code/player/trunk/server/CMakeLists.txt
code/player/trunk/server/drivers/gps/CMakeLists.txt
code/player/trunk/server/drivers/imu/xsens/CMakeLists.txt
code/player/trunk/server/drivers/imu/xsens/XSensMT.cc
code/player/trunk/server/drivers/power/CMakeLists.txt
code/player/trunk/server/drivers/ranger/CMakeLists.txt
code/player/trunk/server/drivers/service_adv/CMakeLists.txt
Modified: code/player/trunk/cmake/internal/DriverUtils.cmake
===================================================================
--- code/player/trunk/cmake/internal/DriverUtils.cmake 2009-12-14 23:06:00 UTC
(rev 8457)
+++ code/player/trunk/cmake/internal/DriverUtils.cmake 2009-12-15 01:05:05 UTC
(rev 8458)
@@ -179,9 +179,9 @@
PLAYERDRIVER_ADD_DRIVEROPTION (${_name} OFF 1)
ENDIF (${_cumulativeVar})
ELSE (NOT PKG_CONFIG_FOUND)
- IF (${ARGC} GREATER 7)
- SET (_minVersion ${ARG7})
- ENDIF (${ARGC} GREATER 7)
+ IF (${ARGC} GREATER 8)
+ SET (_minVersion ${ARGV8})
+ ENDIF (${ARGC} GREATER 8)
# Look for the package using pkg-config
SET (_pkgVar "${_package}_PKG")
Modified: code/player/trunk/server/CMakeLists.txt
===================================================================
--- code/player/trunk/server/CMakeLists.txt 2009-12-14 23:06:00 UTC (rev
8457)
+++ code/player/trunk/server/CMakeLists.txt 2009-12-15 01:05:05 UTC (rev
8458)
@@ -24,16 +24,11 @@
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/replace)
SET (playerreplaceLib playerreplace)
ENDIF (NOT HAVE_GETOPT)
-# On Windows, player.exe also needs to link to the same libs as
-# playerdrivers.dll. The libs seem to get added by CMake automatically, but
-# the directories have to be done manually.
-IF (PLAYER_OS_WIN)
- IF (PLAYER_DRIVERSLIB_LIBDIRS)
- FILTER_EMPTY (driverLinkDirs "${PLAYER_DRIVERSLIB_LIBDIRS}")
- FILTER_DUPLICATES (driverLinkDirs "${driverLinkDirs}")
- LINK_DIRECTORIES (${driverLinkDirs})
- ENDIF (PLAYER_DRIVERSLIB_LIBDIRS)
-ENDIF (PLAYER_OS_WIN)
+IF (PLAYER_DRIVERSLIB_LIBDIRS)
+ FILTER_EMPTY (driverLinkDirs "${PLAYER_DRIVERSLIB_LIBDIRS}")
+ FILTER_DUPLICATES (driverLinkDirs "${driverLinkDirs}")
+ LINK_DIRECTORIES (${driverLinkDirs})
+ENDIF (PLAYER_DRIVERSLIB_LIBDIRS)
# Source files
SET (playerSrcs server.cc)
Modified: code/player/trunk/server/drivers/gps/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/gps/CMakeLists.txt 2009-12-14 23:06:00 UTC
(rev 8457)
+++ code/player/trunk/server/drivers/gps/CMakeLists.txt 2009-12-15 01:05:05 UTC
(rev 8458)
@@ -5,7 +5,7 @@
PLAYERDRIVER_OPTION (gbxgarminacfr build_gbxgarminacfr ON)
PLAYERDRIVER_REQUIRE_PKG (gbxgarminacfr build_gbxgarminacfr GbxGarminAcfr
gbxgarminacfr_includeDirs gbxgarminacfr_libDirs gbxgarminacfr_linkLibs
- gbxgarminacfr_linkFlags gbxgarminacfr_cFlags 1.0.0)
+ gbxgarminacfr_linkFlags gbxgarminacfr_cFlags =1.0.0)
PLAYERDRIVER_ADD_DRIVER (gbxgarminacfr build_gbxgarminacfr
INCLUDEDIRS ${gbxgarminacfr_includeDirs} LIBDIRS ${gbxgarminacfr_libDirs}
LINKLIBS ${gbxgarminacfr_linkLibs} LINKFLAGS ${gbxgarminacfr_linkFlags}
Modified: code/player/trunk/server/drivers/imu/xsens/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/imu/xsens/CMakeLists.txt 2009-12-14
23:06:00 UTC (rev 8457)
+++ code/player/trunk/server/drivers/imu/xsens/CMakeLists.txt 2009-12-15
01:05:05 UTC (rev 8458)
@@ -1,13 +1,15 @@
-PLAYERDRIVER_OPTION (XSensMT build_XSensMT ON)
-PLAYERDRIVER_REQUIRE_ENVVAR (XSensMT build_XSensMT XSENSMT_SOURCE_DIR
xsensmtSrcDir)
+PLAYERDRIVER_OPTION (xsensmt build_xsensmt OFF "Disabled by default - set
XSENSMT_SOURCE_DIR")
+SET (XSENSMT_SOURCE_DIR "" CACHE FILEPATH "Directory containing the XSensMT
manufacturer source files")
+MARK_AS_ADVANCED (XSENSMT_SOURCE_DIR)
SET (xsensmtSrcs XSensMT.cc
- ${xsensmtSrcDir}/xsens_list.cpp
- ${xsensmtSrcDir}/xsens_time.cpp
- ${xsensmtSrcDir}/xsens_std.cpp
- ${xsensmtSrcDir}/cmt1.cpp
- ${xsensmtSrcDir}/cmt2.cpp
- ${xsensmtSrcDir}/cmt3.cpp
- ${xsensmtSrcDir}/cmtscan.cpp
- ${xsensmtSrcDir}/cmtmessage.cpp
- ${xsensmtSrcDir}/cmtpacket.cpp)
-PLAYERDRIVER_ADD_DRIVER (XSensMT build_XSensMT SOURCES ${xsensmtSrcs})
+ ${XSENSMT_SOURCE_DIR}/xsens_time.cpp
+ ${XSENSMT_SOURCE_DIR}/xsens_std.cpp
+ ${XSENSMT_SOURCE_DIR}/cmt1.cpp
+ ${XSENSMT_SOURCE_DIR}/cmt2.cpp
+ ${XSENSMT_SOURCE_DIR}/cmt3.cpp
+ ${XSENSMT_SOURCE_DIR}/cmtscan.cpp
+ ${XSENSMT_SOURCE_DIR}/cmtmessage.cpp
+ ${XSENSMT_SOURCE_DIR}/cmtpacket.cpp)
+PLAYERDRIVER_ADD_DRIVER (xsensmt build_xsensmt SOURCES ${xsensmtSrcs}
+ INCLUDEDIRS ${XSENSMT_SOURCE_DIR})
+
Modified: code/player/trunk/server/drivers/imu/xsens/XSensMT.cc
===================================================================
--- code/player/trunk/server/drivers/imu/xsens/XSensMT.cc 2009-12-14
23:06:00 UTC (rev 8457)
+++ code/player/trunk/server/drivers/imu/xsens/XSensMT.cc 2009-12-15
01:05:05 UTC (rev 8458)
@@ -176,7 +176,7 @@
////////////////////////////////////////////////////////////////////////////////
// Registers the driver in the driver table. Called from the
// player_driver_init function that the loader looks for
-void XSensMT_Register (DriverTable* table)
+void xsensmt_Register (DriverTable* table)
{
table->AddDriver ("xsensmt", XSensMT_Init);
}
Modified: code/player/trunk/server/drivers/power/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/power/CMakeLists.txt 2009-12-14
23:06:00 UTC (rev 8457)
+++ code/player/trunk/server/drivers/power/CMakeLists.txt 2009-12-15
01:05:05 UTC (rev 8458)
@@ -1,7 +1,7 @@
PLAYERDRIVER_OPTION (oceanserver build_oceanserver ON)
PLAYERDRIVER_REQUIRE_PKG (oceanserver build_oceanserver GbxSmartBatteryAcfr
gbxsmartbatteryacfr_includeDirs gbxsmartbatteryacfr_libDirs
gbxsmartbatteryacfr_linkLibs
- gbxsmartbatteryacfr_linkFlags gbxsmartbatteryacfr_cFlags 1.0.0)
+ gbxsmartbatteryacfr_linkFlags gbxsmartbatteryacfr_cFlags =1.0.0)
PLAYERDRIVER_ADD_DRIVER (oceanserver build_oceanserver
INCLUDEDIRS ${gbxsmartbatteryacfr_includeDirs} LIBDIRS
${gbxsmartbatteryacfr_libDirs}
LINKLIBS ${gbxsmartbatteryacfr_linkLibs} LINKFLAGS
${gbxsmartbatteryacfr_linkFlags}
Modified: code/player/trunk/server/drivers/ranger/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/ranger/CMakeLists.txt 2009-12-14
23:06:00 UTC (rev 8457)
+++ code/player/trunk/server/drivers/ranger/CMakeLists.txt 2009-12-15
01:05:05 UTC (rev 8458)
@@ -1,7 +1,7 @@
PLAYERDRIVER_OPTION (gbxsickacfr build_gbxsickacfr ON)
PLAYERDRIVER_REQUIRE_PKG (gbxsickacfr build_gbxsickacfr GbxSickAcfr
gbxsickacfr_includeDirs gbxsickacfr_libDirs gbxsickacfr_linkLibs
- gbxsickacfr_linkFlags gbxsickacfr_cFlags 1.0.0)
+ gbxsickacfr_linkFlags gbxsickacfr_cFlags =1.0.0)
PLAYERDRIVER_ADD_DRIVER (gbxsickacfr build_gbxsickacfr
INCLUDEDIRS ${gbxsickacfr_includeDirs} LIBDIRS ${gbxsickacfr_libDirs}
LINKLIBS ${gbxsickacfr_linkLibs} LINKFLAGS ${gbxsickacfr_linkFlags}
@@ -10,7 +10,7 @@
PLAYERDRIVER_OPTION (hokuyo_aist build_hokuyo_aist ON)
PLAYERDRIVER_REQUIRE_PKG (hokuyo_aist build_hokuyo_aist hokuyo_aist
hokuyo_aist_includeDirs hokuyo_aist_libDirs hokuyo_aist_linkLibs
- hokuyo_aist_linkFlags hokuyo_aist_cFlags 1.0.0)
+ hokuyo_aist_linkFlags hokuyo_aist_cFlags =1.0.0)
PLAYERDRIVER_ADD_DRIVER (hokuyo_aist build_hokuyo_aist
INCLUDEDIRS ${hokuyo_aist_includeDirs} LIBDIRS ${hokuyo_aist_libDirs}
LINKLIBS ${hokuyo_aist_linkLibs} LINKFLAGS ${hokuyo_aist_linkFlags}
Modified: code/player/trunk/server/drivers/service_adv/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/service_adv/CMakeLists.txt 2009-12-14
23:06:00 UTC (rev 8457)
+++ code/player/trunk/server/drivers/service_adv/CMakeLists.txt 2009-12-15
01:05:05 UTC (rev 8458)
@@ -1,6 +1,6 @@
PLAYERDRIVER_OPTION (service_adv_mdns build_service_adv_mdns OFF "Disabled by
default")
PLAYERDRIVER_REQUIRE_PKG (service_adv_mdns build_service_adv_mdns howl
- howl__includeDirs howl_libDirs howl_linkLibs howl_linkFlags howl_cFlags
">= 0.9.6")
+ howl__includeDirs howl_libDirs howl_linkLibs howl_linkFlags howl_cFlags
">=0.9.6")
PLAYERDRIVER_ADD_DRIVER (service_adv_mdns build_service_adv_mdns
INCLUDEDIRS {howl__includeDirs} LIBDIRS ${howl_libDirs} LINKLIBS
${howl_linkLibs} LINKFLAGS ${howl_linkFlags} CFLAGS ${howl_cFlags}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Return on Information:
Google Enterprise Search pays you back
Get the facts.
http://p.sf.net/sfu/google-dev2dev
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
