Revision: 8013
http://playerstage.svn.sourceforge.net/playerstage/?rev=8013&view=rev
Author: gbiggs
Date: 2009-07-14 03:30:41 +0000 (Tue, 14 Jul 2009)
Log Message:
-----------
Removed the need for quotes around various arguments when adding drivers
Modified Paths:
--------------
code/player/trunk/CMake_Todo.txt
code/player/trunk/cmake/internal/DriverUtils.cmake
code/player/trunk/server/drivers/actarray/CMakeLists.txt
code/player/trunk/server/drivers/blobfinder/artoolkitplus/CMakeLists.txt
code/player/trunk/server/drivers/blobfinder/shapetracker/CMakeLists.txt
code/player/trunk/server/drivers/blobfinder/simpleshape/CMakeLists.txt
code/player/trunk/server/drivers/blobfinder/upcbarcode/CMakeLists.txt
code/player/trunk/server/drivers/camera/1394/CMakeLists.txt
code/player/trunk/server/drivers/camera/cvcam/CMakeLists.txt
code/player/trunk/server/drivers/camera/imageseq/CMakeLists.txt
code/player/trunk/server/drivers/camera/unicap/CMakeLists.txt
code/player/trunk/server/drivers/camera/videocanny/CMakeLists.txt
code/player/trunk/server/drivers/camera/yarp/CMakeLists.txt
code/player/trunk/server/drivers/gps/CMakeLists.txt
code/player/trunk/server/drivers/health/statgrab/CMakeLists.txt
code/player/trunk/server/drivers/localization/amcl/CMakeLists.txt
code/player/trunk/server/drivers/map/CMakeLists.txt
code/player/trunk/server/drivers/mixed/chatterbox/CMakeLists.txt
code/player/trunk/server/drivers/mixed/garcia/CMakeLists.txt
code/player/trunk/server/drivers/mixed/mricp/CMakeLists.txt
code/player/trunk/server/drivers/mixed/phidgetIFK/CMakeLists.txt
code/player/trunk/server/drivers/mixed/rmp/CMakeLists.txt
code/player/trunk/server/drivers/mixed/robotino/CMakeLists.txt
code/player/trunk/server/drivers/opaque/CMakeLists.txt
code/player/trunk/server/drivers/planner/wavefront/CMakeLists.txt
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
code/player/trunk/server/drivers/speech/recognition/CMakeLists.txt
code/player/trunk/server/drivers/stereo/CMakeLists.txt
code/player/trunk/server/drivers/vectormap/CMakeLists.txt
code/player/trunk/server/drivers/wsn/CMakeLists.txt
Modified: code/player/trunk/CMake_Todo.txt
===================================================================
--- code/player/trunk/CMake_Todo.txt 2009-07-14 02:48:56 UTC (rev 8012)
+++ code/player/trunk/CMake_Todo.txt 2009-07-14 03:30:41 UTC (rev 8013)
@@ -1,4 +1,2 @@
- Java bindings for core, xdr, tcp, etc
-- dist tarballs, packages, etc - add in the extra_dist files to the source
one, make the debian one
- Figure out why C++ tests and C++ examples don't link properly when building
as static libs, even though the server and utils do.
-- PLAYER_PROCESS_ARGUMENTS should not need to have arguments enclosed in
quotes. Fix this.
Modified: code/player/trunk/cmake/internal/DriverUtils.cmake
===================================================================
--- code/player/trunk/cmake/internal/DriverUtils.cmake 2009-07-14 02:48:56 UTC
(rev 8012)
+++ code/player/trunk/cmake/internal/DriverUtils.cmake 2009-07-14 03:30:41 UTC
(rev 8013)
@@ -38,6 +38,7 @@
MESSAGE (STATUS "WARNING: Unkeyworded arguments found in
PLAYERDRIVER_ADD_DRIVER: ${_junk}")
ENDIF (_junk)
LIST_TO_STRING (_cFlags "${_cFlags}")
+ LIST_TO_STRING (_linkFlags "${_linkFlags}")
IF (NOT _srcs)
MESSAGE (STATUS "WARNING: No sources given for driver ${_name}")
ENDIF (NOT _srcs)
@@ -62,6 +63,7 @@
MESSAGE (STATUS "WARNING: Unkeyworded arguments found in
PLAYERDRIVER_ADD_EXTRA: ${_junk}")
ENDIF (_junk)
LIST_TO_STRING (_cFlags "${_cFlags}")
+ LIST_TO_STRING (_linkFlags "${_linkFlags}")
# Add the list of sources to the list of sources for libplayerdrivers, and
add various flags
PLAYERDRIVER_ADD_EXTRA_TO_BUILT (${_name} "${_includeDir}" "${_libDirs}"
"${_linkLibs}" "${_linkFlags}" "${_cFlags}" ${_srcs})
ENDMACRO (PLAYERDRIVER_ADD_EXTRA)
Modified: code/player/trunk/server/drivers/actarray/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/actarray/CMakeLists.txt 2009-07-14
02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/actarray/CMakeLists.txt 2009-07-14
03:30:41 UTC (rev 8013)
@@ -16,5 +16,5 @@
SET (CMAKE_REQUIRED_DEFINITIONS)
PLAYERDRIVER_ADD_DRIVER (amtecm5 build_amtecm5
- INCLUDEDIRS "${amtecExtraIncludeDirs}" LIBDIRS "${AMTECM5_DIR}/lib"
- LINKFLAGS "${amtecExtraLibs}" CFLAGS "${amtecCFlags}" SOURCES amtecM5.cc)
+ INCLUDEDIRS ${amtecExtraIncludeDirs} LIBDIRS ${AMTECM5_DIR}/lib
+ LINKFLAGS ${amtecExtraLibs} CFLAGS ${amtecCFlags} SOURCES amtecM5.cc)
Modified:
code/player/trunk/server/drivers/blobfinder/artoolkitplus/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/blobfinder/artoolkitplus/CMakeLists.txt
2009-07-14 02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/blobfinder/artoolkitplus/CMakeLists.txt
2009-07-14 03:30:41 UTC (rev 8013)
@@ -1,7 +1,7 @@
PLAYERDRIVER_OPTION (artoolkitplus build_artoolkitplus ON)
PLAYERDRIVER_REQUIRE_PKG (artoolkitplus build_artoolkitplus artoolkitplus
- artoolkitplus_includeDirs artoolkitplus_libDirs artoolkitplus_linkLibs
artoolkitplus_linkFlags artoolkitplus_cFlags ">=2.1")
+ artoolkitplus_includeDirs artoolkitplus_libDirs artoolkitplus_linkLibs
artoolkitplus_linkFlags artoolkitplus_cFlags >=2.1)
PLAYERDRIVER_ADD_DRIVER (artoolkitplus build_artoolkitplus
- INCLUDEDIRS "${artoolkitplus_includeDirs}" LIBDIRS
"${artoolkitplus_libDirs}" LINKLIBS "${artoolkitplus_linkLibs}"
- LINKFLAGS "${artoolkitplus_linkFlags}" CFLAGS "${artoolkitplus_cFlags}"
+ INCLUDEDIRS ${artoolkitplus_includeDirs} LIBDIRS ${artoolkitplus_libDirs}
LINKLIBS ${artoolkitplus_linkLibs}
+ LINKFLAGS ${artoolkitplus_linkFlags} CFLAGS ${artoolkitplus_cFlags}
SOURCES artoolkitplus.cc)
Modified:
code/player/trunk/server/drivers/blobfinder/shapetracker/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/blobfinder/shapetracker/CMakeLists.txt
2009-07-14 02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/blobfinder/shapetracker/CMakeLists.txt
2009-07-14 03:30:41 UTC (rev 8013)
@@ -2,6 +2,6 @@
PLAYERDRIVER_REQUIRE_PKG (shapetracker build_shapetracker opencv
shapetracker_includeDirs shapetracker_libDirs shapetracker_linkLibs
shapetracker_linkFlags shapetracker_cFlags)
PLAYERDRIVER_ADD_DRIVER (shapetracker build_shapetracker
- INCLUDEDIRS "${shapetracker_includeDirs}" LIBDIRS
"${shapetracker_libDirs}" LINKLIBS "${shapetracker_linkLibs}"
- LINKFLAGS "${shapetracker_linkFlags}" CFLAGS
"-I${CMAKE_CURRENT_SOURCE_DIR}/../.. ${shapetracker_cFlags}"
+ INCLUDEDIRS ${shapetracker_includeDirs} LIBDIRS ${shapetracker_libDirs}
LINKLIBS ${shapetracker_linkLibs}
+ LINKFLAGS ${shapetracker_linkFlags} CFLAGS
-I${CMAKE_CURRENT_SOURCE_DIR}/../.. ${shapetracker_cFlags}
SOURCES shapetracker.cc)
Modified: code/player/trunk/server/drivers/blobfinder/simpleshape/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/blobfinder/simpleshape/CMakeLists.txt
2009-07-14 02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/blobfinder/simpleshape/CMakeLists.txt
2009-07-14 03:30:41 UTC (rev 8013)
@@ -2,6 +2,6 @@
PLAYERDRIVER_REQUIRE_PKG (simpleshape build_simpleshape opencv
simpleshape_includeDirs simpleshape_libDirs simpleshape_linkLibs
simpleshape_linkFlags simpleshape_cFlags)
PLAYERDRIVER_ADD_DRIVER (simpleshape build_simpleshape
- INCLUDEDIRS "${simpleshape_includeDirs}" LIBDIRS "${simpleshape_libDirs}"
LINKLIBS "${simpleshape_linkLibs}"
- LINKFLAGS "${simpleshape_linkFlags}" CFLAGS "${simpleshape_cFlags}"
+ INCLUDEDIRS ${simpleshape_includeDirs} LIBDIRS ${simpleshape_libDirs}
LINKLIBS ${simpleshape_linkLibs}
+ LINKFLAGS ${simpleshape_linkFlags} CFLAGS ${simpleshape_cFlags}
SOURCES simpleshape.cc)
Modified: code/player/trunk/server/drivers/blobfinder/upcbarcode/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/blobfinder/upcbarcode/CMakeLists.txt
2009-07-14 02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/blobfinder/upcbarcode/CMakeLists.txt
2009-07-14 03:30:41 UTC (rev 8013)
@@ -2,6 +2,6 @@
PLAYERDRIVER_REQUIRE_PKG (upcbarcode build_upcbarcode opencv
upcbarcode_includeDirs upcbarcode_libDirs upcbarcode_linkLibs
upcbarcode_linkFlags upcbarcode_cFlags)
PLAYERDRIVER_ADD_DRIVER (upcbarcode build_upcbarcode
- INCLUDEDIRS "${upcbarcode_includeDirs}" LIBDIRS "${upcbarcode_libDirs}"
LINKLIBS "${upcbarcode_linkLibs}"
- LINKFLAGS "${upcbarcode_linkFlags}" CFLAGS "${upcbarcode_cFlags}"
+ INCLUDEDIRS ${upcbarcode_includeDirs} LIBDIRS ${upcbarcode_libDirs}
LINKLIBS ${upcbarcode_linkLibs}
+ LINKFLAGS ${upcbarcode_linkFlags} CFLAGS ${upcbarcode_cFlags}
SOURCES upcbarcode.cc)
Modified: code/player/trunk/server/drivers/camera/1394/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/camera/1394/CMakeLists.txt 2009-07-14
02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/camera/1394/CMakeLists.txt 2009-07-14
03:30:41 UTC (rev 8013)
@@ -49,6 +49,6 @@
SET (camera1394_h "${CMAKE_CURRENT_BINARY_DIR}/camera1394.h")
CONFIGURE_FILE (${camera1394_h_in} ${camera1394_h})
-PLAYERDRIVER_ADD_DRIVER (camera1394 build_camera1394 LINKFLAGS
"${c1394LinkFlags}"
- CFLAGS "${c1394CFlags}
-I${PROJECT_SOURCE_DIR}/server/drivers/blobfinder/cmvision"
+PLAYERDRIVER_ADD_DRIVER (camera1394 build_camera1394 LINKFLAGS
${c1394LinkFlags}
+ CFLAGS ${c1394CFlags}
-I${PROJECT_SOURCE_DIR}/server/drivers/blobfinder/cmvision
SOURCES ${c1394Sources} ${camera1394_h})
Modified: code/player/trunk/server/drivers/camera/cvcam/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/camera/cvcam/CMakeLists.txt
2009-07-14 02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/camera/cvcam/CMakeLists.txt
2009-07-14 03:30:41 UTC (rev 8013)
@@ -2,6 +2,6 @@
PLAYERDRIVER_REQUIRE_PKG (cvcam build_cvcam opencv cvcam_includeDirs
cvcam_libDirs cvcam_linkLibs cvcam_linkFlags cvcam_cFlags)
PLAYERDRIVER_ADD_DRIVER (cvcam build_cvcam
- INCLUDEDIRS "${cvcam_includeDirs}" LIBDIRS "${cvcam_libDirs}" LINKLIBS
"${cvcam_linkLibs}"
- LINKFLAGS "${cvcam_linkFlags}" CFLAGS "${cvcam_cFlags}"
+ INCLUDEDIRS ${cvcam_includeDirs} LIBDIRS ${cvcam_libDirs} LINKLIBS
${cvcam_linkLibs}
+ LINKFLAGS ${cvcam_linkFlags} CFLAGS ${cvcam_cFlags}
SOURCES cvcam.cc)
Modified: code/player/trunk/server/drivers/camera/imageseq/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/camera/imageseq/CMakeLists.txt
2009-07-14 02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/camera/imageseq/CMakeLists.txt
2009-07-14 03:30:41 UTC (rev 8013)
@@ -2,6 +2,6 @@
PLAYERDRIVER_REQUIRE_PKG (imageseq build_imageseq opencv
imageseq_includeDirs imageseq_libDirs imageseq_linkLibs imageseq_linkFlags
imageseq_cFlags)
PLAYERDRIVER_ADD_DRIVER (imageseq build_imageseq
- INCLUDEDIRS "${imageseq_includeDirs}" LIBDIRS "${imageseq_libDirs}"
LINKLIBS "${imageseq_linkLibs}"
- LINKFLAGS "${imageseq_linkFlags}" CFLAGS "${imageseq_cFlags}"
+ INCLUDEDIRS ${imageseq_includeDirs} LIBDIRS ${imageseq_libDirs} LINKLIBS
${imageseq_linkLibs}
+ LINKFLAGS ${imageseq_linkFlags} CFLAGS ${imageseq_cFlags}
SOURCES imageseq.cc)
Modified: code/player/trunk/server/drivers/camera/unicap/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/camera/unicap/CMakeLists.txt
2009-07-14 02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/camera/unicap/CMakeLists.txt
2009-07-14 03:30:41 UTC (rev 8013)
@@ -15,6 +15,6 @@
PLAYERDRIVER_REQUIRE_HEADER (unicapimage build_unicapimage ${unicapReqHeader})
PLAYERDRIVER_ADD_DRIVER (unicapimage build_unicapimage
- LINKFLAGS "-L{UNICAP_DIR}/lib -lunicap -lrt"
- CFLAGS "-I${UNICAP_DIR}/include
-I${UNICAP_DIR}/include/unicap"
+ LINKFLAGS -L{UNICAP_DIR}/lib -lunicap -lrt
+ CFLAGS -I${UNICAP_DIR}/include
-I${UNICAP_DIR}/include/unicap
SOURCES unicapImage.cc)
Modified: code/player/trunk/server/drivers/camera/videocanny/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/camera/videocanny/CMakeLists.txt
2009-07-14 02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/camera/videocanny/CMakeLists.txt
2009-07-14 03:30:41 UTC (rev 8013)
@@ -2,6 +2,6 @@
PLAYERDRIVER_REQUIRE_PKG (videocanny build_videocanny opencv
videocanny_includeDirs videocanny_libDirs videocanny_linkLibs
videocanny_linkFlags videocanny_cFlags)
PLAYERDRIVER_ADD_DRIVER (videocanny build_videocanny
- INCLUDEDIRS "${videocanny_includeDirs}" LIBDIRS "${videocanny_libDirs}"
LINKLIBS "${videocanny_linkLibs}"
- LINKFLAGS "${videocanny_linkFlags}" CFLAGS "${videocanny_cFlags}"
+ INCLUDEDIRS ${videocanny_includeDirs} LIBDIRS ${videocanny_libDirs}
LINKLIBS ${videocanny_linkLibs}
+ LINKFLAGS ${videocanny_linkFlags} CFLAGS ${videocanny_cFlags}
SOURCES videocanny.cc)
Modified: code/player/trunk/server/drivers/camera/yarp/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/camera/yarp/CMakeLists.txt 2009-07-14
02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/camera/yarp/CMakeLists.txt 2009-07-14
03:30:41 UTC (rev 8013)
@@ -1,4 +1,4 @@
PLAYERDRIVER_OPTION (yarpimage build_yarpimage ON)
PLAYERDRIVER_REQUIRE_HEADER (yarpimage build_yarpimage yarp/os/all.h)
PLAYERDRIVER_REQUIRE_HEADER (yarpimage build_yarpimage yarp/sig/all.h)
-PLAYERDRIVER_ADD_DRIVER (yarpimage build_yarpimage LINKFLAGS "-lYARP_sig
-lYARP_OS -lACE" SOURCES YarpImage.cc)
+PLAYERDRIVER_ADD_DRIVER (yarpimage build_yarpimage LINKFLAGS -lYARP_sig
-lYARP_OS -lACE SOURCES YarpImage.cc)
Modified: code/player/trunk/server/drivers/gps/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/gps/CMakeLists.txt 2009-07-14 02:48:56 UTC
(rev 8012)
+++ code/player/trunk/server/drivers/gps/CMakeLists.txt 2009-07-14 03:30:41 UTC
(rev 8013)
@@ -7,7 +7,7 @@
gbxgarminacfr_includeDirs gbxgarminacfr_libDirs gbxgarminacfr_linkLibs
gbxgarminacfr_linkFlags gbxgarminacfr_cFlags)
PLAYERDRIVER_ADD_DRIVER (gbxgarminacfr build_gbxgarminacfr
- INCLUDEDIRS "${gbxgarminacfr_includeDirs}" LIBDIRS
"${gbxgarminacfr_libDirs}"
- LINKLIBS "${gbxgarminacfr_linkLibs}" LINKFLAGS "${gbxgarminacfr_linkFlags}"
- CFLAGS "${gbxgarminacfr_cFlags}" SOURCES gbxgarminacfr.cc)
+ INCLUDEDIRS ${gbxgarminacfr_includeDirs} LIBDIRS ${gbxgarminacfr_libDirs}
+ LINKLIBS ${gbxgarminacfr_linkLibs} LINKFLAGS ${gbxgarminacfr_linkFlags}
+ CFLAGS ${gbxgarminacfr_cFlags} SOURCES gbxgarminacfr.cc)
Modified: code/player/trunk/server/drivers/health/statgrab/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/health/statgrab/CMakeLists.txt
2009-07-14 02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/health/statgrab/CMakeLists.txt
2009-07-14 03:30:41 UTC (rev 8013)
@@ -2,6 +2,6 @@
PLAYERDRIVER_REQUIRE_PKG (statgrab build_statgrab libstatgrab
statgrab_includeDirs statgrab_libDirs statgrab_linkLibs statgrab_linkFlags
statgrab_cFlags)
PLAYERDRIVER_ADD_DRIVER (statgrab build_statgrab
- INCLUDEDIRS "${statgrab_includeDirs}" LIBDIRS "${statgrab_libDirs}"
LINKLIBS "${statgrab_linkLibs}"
- LINKFLAGS "${statgrab_linkFlags}" CFLAGS "${statgrab_cFlags}"
+ INCLUDEDIRS ${statgrab_includeDirs} LIBDIRS ${statgrab_libDirs} LINKLIBS
${statgrab_linkLibs}
+ LINKFLAGS ${statgrab_linkFlags} CFLAGS ${statgrab_cFlags}
SOURCES statgrab_health.cpp)
Modified: code/player/trunk/server/drivers/localization/amcl/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/localization/amcl/CMakeLists.txt
2009-07-14 02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/localization/amcl/CMakeLists.txt
2009-07-14 03:30:41 UTC (rev 8013)
@@ -22,11 +22,11 @@
map/map_draw.c)
IF (INCLUDE_RTKGUI)
- SET (linkFlags "-L${PROJECT_BINARY_DIR}/rtk2 -lrtk ${GTK_LINKFLAGS}")
- SET (cFlags "-I${PROJECT_SOURCE_DIR}/rtk2 ${GTK_CFLAGS}")
+ SET (linkFlags -L${PROJECT_BINARY_DIR}/rtk2 -lrtk ${GTK_LINKFLAGS})
+ SET (cFlags -I${PROJECT_SOURCE_DIR}/rtk2 ${GTK_CFLAGS})
ELSE (INCLUDE_RTKGUI)
SET (linkFlags)
SET (cFlags)
ENDIF (INCLUDE_RTKGUI)
-PLAYERDRIVER_ADD_DRIVER (amcl build_amcl LINKFLAGS "${linkFlags}" CFLAGS
"${cFlags}" SOURCES ${amclSrcs})
+PLAYERDRIVER_ADD_DRIVER (amcl build_amcl LINKFLAGS ${linkFlags} CFLAGS
${cFlags} SOURCES ${amclSrcs})
Modified: code/player/trunk/server/drivers/map/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/map/CMakeLists.txt 2009-07-14 02:48:56 UTC
(rev 8012)
+++ code/player/trunk/server/drivers/map/CMakeLists.txt 2009-07-14 03:30:41 UTC
(rev 8013)
@@ -2,8 +2,8 @@
PLAYERDRIVER_REQUIRE_PKG (mapfile build_mapfile gdk-pixbuf-2.0
mapfile_includeDirs mapfile_libDirs mapfile_linkLibs mapfile_linkFlags
mapfile_cFlags)
PLAYERDRIVER_ADD_DRIVER (mapfile build_mapfile
- INCLUDEDIRS "${mapfile_includeDirs}" LIBDIRS "${mapfile_libDirs}" LINKLIBS
"${mapfile_linkLibs}"
- LINKFLAGS "${mapfile_linkFlags}" CFLAGS "${mapfile_cFlags}"
+ INCLUDEDIRS ${mapfile_includeDirs} LIBDIRS ${mapfile_libDirs} LINKLIBS
${mapfile_linkLibs}
+ LINKFLAGS ${mapfile_linkFlags} CFLAGS ${mapfile_cFlags}
SOURCES mapfile.cc)
PLAYERDRIVER_OPTION (mapcspace build_mapcspace ON)
@@ -13,8 +13,8 @@
PLAYERDRIVER_REQUIRE_PKG (mapscale build_mapscale gdk-pixbuf-2.0
mapfile_includeDirs mapfile_libDirs mapfile_linkLibs mapfile_linkFlags
mapfile_cFlags)
PLAYERDRIVER_ADD_DRIVER (mapscale build_mapscale
- INCLUDEDIRS "${mapfile_includeDirs}" LIBDIRS "${mapfile_libDirs}" LINKLIBS
"${mapfile_linkLibs}"
- LINKFLAGS "${mapfile_linkFlags}" CFLAGS "${mapfile_cFlags}"
+ INCLUDEDIRS ${mapfile_includeDirs} LIBDIRS ${mapfile_libDirs} LINKLIBS
${mapfile_linkLibs}
+ LINKFLAGS ${mapfile_linkFlags} CFLAGS ${mapfile_cFlags}
SOURCES maptransform.cc mapscale.cc)
PLAYERDRIVER_OPTION (vmapfile build_vmapfile ON)
Modified: code/player/trunk/server/drivers/mixed/chatterbox/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/mixed/chatterbox/CMakeLists.txt
2009-07-14 02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/mixed/chatterbox/CMakeLists.txt
2009-07-14 03:30:41 UTC (rev 8013)
@@ -1,6 +1,6 @@
PLAYERDRIVER_OPTION (chatterbox build_chatterbox OFF "Experimental")
SET (robostix "/home/gumstix/vR1078experimental/robostix")
PLAYERDRIVER_ADD_DRIVER (chatterbox build_chatterbox
- LINKFLAGS "-L${robostix}/gumstix/roomba -lroboi2c"
- CFLAGS "-I${robostix}/Shared -I${robostix}/gumstix/Common
-I${robostix}/gumstix/roomba"
+ LINKFLAGS -L${robostix}/gumstix/roomba -lroboi2c
+ CFLAGS -I${robostix}/Shared -I${robostix}/gumstix/Common
-I${robostix}/gumstix/roomba
SOURCES cb_driver.cc cb_i2c.c)
Modified: code/player/trunk/server/drivers/mixed/garcia/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/mixed/garcia/CMakeLists.txt
2009-07-14 02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/mixed/garcia/CMakeLists.txt
2009-07-14 03:30:41 UTC (rev 8013)
@@ -2,6 +2,6 @@
PLAYERDRIVER_REQUIRE_PKG (garcia build_garcia libgarcia
garcia_includeDirs garcia_libDirs garcia_linkLibs garcia_linkFlags
garcia_cFlags)
PLAYERDRIVER_ADD_DRIVER (garcia build_garcia
- INCLUDEDIRS "${garcia_includeDir}" LIBDIRS "${garcia_libDir}" LINKLIBS
"${garcia_linkLibs}"
- LINKFLAGS "${garcia_linkFlags}" CFLAGS "${garcia_cFlags}"
+ INCLUDEDIRS ${garcia_includeDir} LIBDIRS ${garcia_libDir} LINKLIBS
${garcia_linkLibs}
+ LINKFLAGS ${garcia_linkFlags} CFLAGS ${garcia_cFlags}
SOURCES garcia_mixed.cc)
Modified: code/player/trunk/server/drivers/mixed/mricp/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/mixed/mricp/CMakeLists.txt 2009-07-14
02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/mixed/mricp/CMakeLists.txt 2009-07-14
03:30:41 UTC (rev 8013)
@@ -14,9 +14,9 @@
PLAYERDRIVER_REQUIRE_PKG (mricp build_mricp gtk+-2.0 gtk_includeDirs
gtk_libDirs gtk_linkLibs gtk_linkFlags gtk_cFlags)
PLAYERDRIVER_REQUIRE_PKG (mricp build_mricp gdk-pixbuf-2.0
gdk_pixbuf_includeDirs gdk_pixbuf_libDirs gdk_pixbuf_linkLibs
gdk_pixbuf_linkFlags gdk_pixbuf_cFlags)
PLAYERDRIVER_ADD_DRIVER (mricp build_mricp
- INCLUDEDIRS "${gtk_includeDirs};${gdk_pixbuf_includeDirs}"
- LIBDIRS "${gtk_libDirs};${gdk_pixbuf_libDirs}"
- LINKLIBS "${gtk_linkLibs};${gdk_pixbuf_linkLibs}"
- LINKFLAGS "${gtk_linkFlags} ${gdk_pixbuf_linkFlags}"
- CFLAGS "-I${PROJECT_SOURCE_DIR}/server/drivers/mixed/mricp/include
${gtk_cFlags} ${gdk_pixbuf_cFlags}"
+ INCLUDEDIRS ${gtk_includeDirs} ${gdk_pixbuf_includeDirs}
+ LIBDIRS ${gtk_libDirs} ${gdk_pixbuf_libDirs}
+ LINKLIBS ${gtk_linkLibs} ${gdk_pixbuf_linkLibs}
+ LINKFLAGS ${gtk_linkFlags} ${gdk_pixbuf_linkFlags}
+ CFLAGS -I${PROJECT_SOURCE_DIR}/server/drivers/mixed/mricp/include
${gtk_cFlags} ${gdk_pixbuf_cFlags}
SOURCES ${mricpSrcs})
Modified: code/player/trunk/server/drivers/mixed/phidgetIFK/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/mixed/phidgetIFK/CMakeLists.txt
2009-07-14 02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/mixed/phidgetIFK/CMakeLists.txt
2009-07-14 03:30:41 UTC (rev 8013)
@@ -12,5 +12,5 @@
ENDIF ("${PHIDGETIFK_DIR}" STREQUAL "")
PLAYERDRIVER_REQUIRE_HEADER (phidgetifk build_phidgetifk ${phidgetReqHeader})
PLAYERDRIVER_ADD_DRIVER (phidgetifk build_phidgetifk
- LINKFLAGS ${phidgetExtraLibs} CFLAGS "${phidgetExtraFlags}"
+ LINKFLAGS ${phidgetExtraLibs} CFLAGS ${phidgetExtraFlags}
SOURCES phidgetIFK.cc)
Modified: code/player/trunk/server/drivers/mixed/rmp/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/mixed/rmp/CMakeLists.txt 2009-07-14
02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/mixed/rmp/CMakeLists.txt 2009-07-14
03:30:41 UTC (rev 8013)
@@ -12,5 +12,5 @@
ENDIF (NOT "${CANLIB_DIR}" STREQUAL "")
PLAYERDRIVER_REQUIRE_HEADER (segwayrmpifk build_segwayrmpifk
${segwayrmpReqHeader})
PLAYERDRIVER_ADD_DRIVER (segwayrmpifk build_segwayrmpifk
- LINKFLAGS ${segwayrmpExtraLibs} CFLAGS "${segwayrmpExtraFlags}"
+ LINKFLAGS ${segwayrmpExtraLibs} CFLAGS ${segwayrmpExtraFlags}
SOURCES segwayrmp.cc canio_kvaser.cc)
Modified: code/player/trunk/server/drivers/mixed/robotino/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/mixed/robotino/CMakeLists.txt
2009-07-14 02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/mixed/robotino/CMakeLists.txt
2009-07-14 03:30:41 UTC (rev 8013)
@@ -5,4 +5,4 @@
IF (PTHREAD_LIB)
SET (PTHREAD_LIB_FLAG "-l${PTHREAD_LIB}")
ENDIF (PTHREAD_LIB)
-PLAYERDRIVER_ADD_DRIVER (robotino build_robotino LINKFLAGS "-lxtimer
-lrobotinocom -lxthread ${PTHREAD_LIB_FLAG}" robotino_driver.cc)
+PLAYERDRIVER_ADD_DRIVER (robotino build_robotino LINKFLAGS -lxtimer
-lrobotinocom -lxthread ${PTHREAD_LIB_FLAG} robotino_driver.cc)
Modified: code/player/trunk/server/drivers/opaque/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/opaque/CMakeLists.txt 2009-07-14
02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/opaque/CMakeLists.txt 2009-07-14
03:30:41 UTC (rev 8013)
@@ -2,8 +2,8 @@
PLAYERDRIVER_REQUIRE_PKG (flexiport build_flexiport flexiport
flexiport_includeDirs
flexiport_libDirs flexiport_linkLibs flexiport_linkFlags flexiport_cFlags)
PLAYERDRIVER_ADD_DRIVER (flexiport build_flexiport
- INCLUDEDIRS "${flexiport_includeDirs}" LIBDIRS "${flexiport_libDirs}"
- LINKLIBS "${flexiport_linkLibs}" LINKFLAGS "${flexiport_linkFlags}" CFLAGS
"${flexiport_cFlags}"
+ INCLUDEDIRS ${flexiport_includeDirs} LIBDIRS ${flexiport_libDirs}
+ LINKLIBS ${flexiport_linkLibs} LINKFLAGS ${flexiport_linkFlags} CFLAGS
${flexiport_cFlags}
SOURCES flexiport.cc)
PLAYERDRIVER_OPTION (serialstream build_serialstream ON)
Modified: code/player/trunk/server/drivers/planner/wavefront/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/planner/wavefront/CMakeLists.txt
2009-07-14 02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/planner/wavefront/CMakeLists.txt
2009-07-14 03:30:41 UTC (rev 8013)
@@ -3,9 +3,9 @@
wavefront_includeDirs wavefront_libDirs wavefront_linkLibs
wavefront_linkFlags wavefront_cFlags)
PLAYERDRIVER_ADD_DRIVER (wavefront build_wavefront
- INCLUDEDIRS "${wavefront_includeDirs}" LIBDIRS "${wavefront_libDirs}"
- LINKLIBS "${wavefront_linkLibs}" LINKFLAGS "${wavefront_linkFlags}"
- CFLAGS "${wavefront_cFlags}"
+ INCLUDEDIRS ${wavefront_includeDirs} LIBDIRS ${wavefront_libDirs}
+ LINKLIBS ${wavefront_linkLibs} LINKFLAGS ${wavefront_linkFlags}
+ CFLAGS ${wavefront_cFlags}
SOURCES plan.c plan_plan.c plan_waypoint.c wavefront.cc heap.c
plan_control.c)
# Also build and install standalone non-Player lib
Modified: code/player/trunk/server/drivers/power/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/power/CMakeLists.txt 2009-07-14
02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/power/CMakeLists.txt 2009-07-14
03:30:41 UTC (rev 8013)
@@ -3,7 +3,7 @@
gbxsmartbatteryacfr_includeDirs gbxsmartbatteryacfr_libDirs
gbxsmartbatteryacfr_linkLibs
gbxsmartbatteryacfr_linkFlags gbxsmartbatteryacfr_cFlags)
PLAYERDRIVER_ADD_DRIVER (oceanserver build_oceanserver
- INCLUDEDIRS "${gbxsmartbatteryacfr_includeDirs}" LIBDIRS
"${gbxsmartbatteryacfr_libDirs}"
- LINKLIBS "${gbxsmartbatteryacfr_linkLibs}" LINKFLAGS
"${gbxsmartbatteryacfr_linkFlags}"
- CFLAGS "${gbxsmartbatteryacfr_cFlags}" SOURCES oceanserver.cc)
+ INCLUDEDIRS ${gbxsmartbatteryacfr_includeDirs} LIBDIRS
${gbxsmartbatteryacfr_libDirs}
+ LINKLIBS ${gbxsmartbatteryacfr_linkLibs} LINKFLAGS
${gbxsmartbatteryacfr_linkFlags}
+ CFLAGS ${gbxsmartbatteryacfr_cFlags} SOURCES oceanserver.cc)
Modified: code/player/trunk/server/drivers/ranger/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/ranger/CMakeLists.txt 2009-07-14
02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/ranger/CMakeLists.txt 2009-07-14
03:30:41 UTC (rev 8013)
@@ -3,18 +3,18 @@
gbxsickacfr_includeDirs gbxsickacfr_libDirs gbxsickacfr_linkLibs
gbxsickacfr_linkFlags gbxsickacfr_cFlags)
PLAYERDRIVER_ADD_DRIVER (gbxsickacfr build_gbxsickacfr
- INCLUDEDIRS "${gbxsickacfr_includeDirs}" LIBDIRS "${gbxsickacfr_libDirs}"
- LINKLIBS "${gbxsickacfr_linkLibs}" LINKFLAGS "${gbxsickacfr_linkFlags}"
- CFLAGS "${gbxsickacfr_cFlags}" SOURCES gbxsickacfr.cc)
+ INCLUDEDIRS ${gbxsickacfr_includeDirs} LIBDIRS ${gbxsickacfr_libDirs}
+ LINKLIBS ${gbxsickacfr_linkLibs} LINKFLAGS ${gbxsickacfr_linkFlags}
+ CFLAGS ${gbxsickacfr_cFlags} SOURCES gbxsickacfr.cc)
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)
PLAYERDRIVER_ADD_DRIVER (hokuyo_aist build_hokuyo_aist
- INCLUDEDIRS "${hokuyo_aist_includeDirs}" LIBDIRS "${hokuyo_aist_libDirs}"
- LINKLIBS "${hokuyo_aist_linkLibs}" LINKFLAGS "${hokuyo_aist_linkFlags}"
- CFLAGS "${hokuyo_aist_cFlags}" SOURCES hokuyo_aist.cc)
+ INCLUDEDIRS ${hokuyo_aist_includeDirs} LIBDIRS ${hokuyo_aist_libDirs}
+ LINKLIBS ${hokuyo_aist_linkLibs} LINKFLAGS ${hokuyo_aist_linkFlags}
+ CFLAGS ${hokuyo_aist_cFlags} SOURCES hokuyo_aist.cc)
PLAYERDRIVER_OPTION (lasertoranger build_lasertoranger ON)
PLAYERDRIVER_ADD_DRIVER (lasertoranger build_lasertoranger SOURCES toranger.cc
lasertoranger.cc)
Modified: code/player/trunk/server/drivers/service_adv/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/service_adv/CMakeLists.txt 2009-07-14
02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/service_adv/CMakeLists.txt 2009-07-14
03:30:41 UTC (rev 8013)
@@ -2,6 +2,6 @@
PLAYERDRIVER_REQUIRE_PKG (service_adv_mdns build_service_adv_mdns howl
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}"
+ INCLUDEDIRS {howl__includeDirs} LIBDIRS ${howl_libDirs} LINKLIBS
+ ${howl_linkLibs} LINKFLAGS ${howl_linkFlags} CFLAGS ${howl_cFlags}
SOURCES mdns.cc)
Modified: code/player/trunk/server/drivers/speech/recognition/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/speech/recognition/CMakeLists.txt
2009-07-14 02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/speech/recognition/CMakeLists.txt
2009-07-14 03:30:41 UTC (rev 8013)
@@ -1,4 +1,4 @@
PLAYERDRIVER_OPTION (sphinx2 build_sphinx2 OFF "Disabled by default")
PLAYERDRIVER_REQUIRE_HEADER (sphinx2 build_sphinx2 sphinx2/ckd_alloc.h)
-PLAYERDRIVER_ADD_DRIVER (sphinx2 build_sphinx2 LINKFLAGS "-lsphinx2
-lsphinx2fe -lsphinx2ad"
+PLAYERDRIVER_ADD_DRIVER (sphinx2 build_sphinx2 LINKFLAGS -lsphinx2 -lsphinx2fe
-lsphinx2ad
SOURCES sphinx2.cc)
Modified: code/player/trunk/server/drivers/stereo/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/stereo/CMakeLists.txt 2009-07-14
02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/stereo/CMakeLists.txt 2009-07-14
03:30:41 UTC (rev 8013)
@@ -3,4 +3,4 @@
IF (PTHREAD_LIB)
SET (PTHREAD_LIB_FLAG "-l${PTHREAD_LIB}")
ENDIF (PTHREAD_LIB)
-PLAYERDRIVER_ADD_DRIVER (stoc build_stoc LINKFLAGS "-lsvscap -lsvs -lsvscalc
${PTHREAD_LIB_FLAG} -ldcap -lraw1394" SOURCES stoc.cc)
+PLAYERDRIVER_ADD_DRIVER (stoc build_stoc LINKFLAGS -lsvscap -lsvs -lsvscalc
${PTHREAD_LIB_FLAG} -ldcap -lraw1394 SOURCES stoc.cc)
Modified: code/player/trunk/server/drivers/vectormap/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/vectormap/CMakeLists.txt 2009-07-14
02:48:56 UTC (rev 8012)
+++ code/player/trunk/server/drivers/vectormap/CMakeLists.txt 2009-07-14
03:30:41 UTC (rev 8013)
@@ -11,13 +11,12 @@
SET (pqLinkFlag)
ENDIF (PLAYER_OS_SOLARIS)
PLAYERDRIVER_ADD_DRIVER (postgis build_postgis
- INCLUDEDIRS "${postgis_includeDirs}" LIBDIRS "${postgis_libDirs}" LINKLIBS
- "${postgis_linkLibs}" LINKFLAGS "${postgis_linkFlags} ${pqLinkFlag}"
- CFLAGS "${postgis_cFlags}" SOURCES postgis.cc dbconn.cc)
+ INCLUDEDIRS ${postgis_includeDirs} LIBDIRS ${postgis_libDirs}
+ LINKLIBS ${postgis_linkLibs} LINKFLAGS ${postgis_linkFlags} ${pqLinkFlag}
+ CFLAGS ${postgis_cFlags} SOURCES postgis.cc dbconn.cc)
PLAYERDRIVER_OPTION (vec2map build_vec2map ON)
-SET(vec2map_linkFlags)
-PLAYERDRIVER_ADD_DRIVER (vec2map build_vec2map LINKFLAGS
"${vec2map_linkFlags}" SOURCES vec2map.cc)
+PLAYERDRIVER_ADD_DRIVER (vec2map build_vec2map SOURCES vec2map.cc)
PLAYERDRIVER_OPTION (robotracker build_robotracker ON)
PLAYERDRIVER_ADD_DRIVER (robotracker build_robotracker SOURCES robotracker.cc)
Modified: code/player/trunk/server/drivers/wsn/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/wsn/CMakeLists.txt 2009-07-14 02:48:56 UTC
(rev 8012)
+++ code/player/trunk/server/drivers/wsn/CMakeLists.txt 2009-07-14 03:30:41 UTC
(rev 8013)
@@ -35,5 +35,5 @@
ENDIF ("${PHIDGETACC_DIR}" STREQUAL "")
PLAYERDRIVER_REQUIRE_HEADER (phidgetAcc build_phidgetAcc ${phidgetReqHeader})
PLAYERDRIVER_ADD_DRIVER (phidgetAcc build_phidgetAcc
- LINKFLAGS ${phidgetExtraLibs} CFLAGS "${phidgetExtraFlags}"
+ LINKFLAGS ${phidgetExtraLibs} CFLAGS ${phidgetExtraFlags}
SOURCES phidgetAcc.cc)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
