Revision: 6724
http://playerstage.svn.sourceforge.net/playerstage/?rev=6724&view=rev
Author: gbiggs
Date: 2008-07-01 19:36:38 -0700 (Tue, 01 Jul 2008)
Log Message:
-----------
Fixed API version checks for camera1394
Modified Paths:
--------------
code/player/trunk/server/drivers/camera/1394/CMakeLists.txt
code/player/trunk/server/drivers/camera/1394/camera1394.cc
Added Paths:
-----------
code/player/trunk/server/drivers/camera/1394/camera1394.h.in
Modified: code/player/trunk/server/drivers/camera/1394/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/camera/1394/CMakeLists.txt 2008-07-01
18:50:43 UTC (rev 6723)
+++ code/player/trunk/server/drivers/camera/1394/CMakeLists.txt 2008-07-02
02:36:38 UTC (rev 6724)
@@ -1,13 +1,13 @@
PLAYERDRIVER_OPTION (camera1394 build_camera1394 ON)
-# PLAYERDRIVER_REQUIRE_LIB (camera1394 build_camera1394 raw1394 main "")
-SET (c1394CFlags "-DDC1394_DMA_SETUP_CAPTURE_ARGS=0
-I${PROJECT_SOURCE_DIR}/server/drivers/blobfinder/cmvision")
IF (build_camera1394)
+ SET (c1394CFlags
"-I${PROJECT_SOURCE_DIR}/server/drivers/blobfinder/cmvision
-I${CMAKE_CURRENT_BINARY_DIR}")
+ SET (DC1394_DMA_SETUP_CAPTURE_ARGS 0)
SET (c1394Sources camera1394.cc
${PROJECT_SOURCE_DIR}/server/drivers/blobfinder/cmvision/conversions.c)
INCLUDE (CheckIncludeFiles)
CHECK_INCLUDE_FILES (dc1394/control.h haveControlH)
IF (haveControlH)
- SET (c1394CFlags "-DDC1394_DMA_SETUP_CAPTURE_ARGS=20")
+ SET (DC1394_DMA_SETUP_CAPTURE_ARGS 20)
CHECK_INCLUDE_FILES (libraw1394/raw1394.h haveRaw1394H)
IF (haveRaw1394H)
SET (c1394LinkFlags "-lraw1394 -ldc1394")
@@ -19,22 +19,27 @@
PLAYERDRIVER_REQUIRE_HEADER (camera1394 build_camera1394
libraw1394/raw1394.h)
PLAYERDRIVER_REQUIRE_HEADER (camera1394 build_camera1394
libdc1394/dc1394_control.h)
IF (HAVE_HDR_LIBRAW1394_RAW1394_H)
- SET (c1394CFlags "${c1394CFlags} -DHAVE_LIBRAW1394")
+ SET (HAVE_LIBRAW1394 1)
ENDIF (HAVE_HDR_LIBRAW1394_RAW1394_H)
SET (testArgsSource ${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp/test_args.c)
FILE (WRITE ${testArgsSource}
- "#include \"libdc1394/dc1394_control.h\"\nint main ()
{dc1394_dma_setup_capture (NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL); return
0;}")
- TRY_COMPILE (argsIs11 ${CMAKE_CURRENT_BINARY_DIR} ${testArgsSource})
+ "#include \"libdc1394/dc1394_control.h\"\nint main ()
{dc1394_dma_setup_capture (NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL); return
0;}\n")
+ TRY_COMPILE (argsIs11 ${CMAKE_CURRENT_BINARY_DIR} ${testArgsSource}
CMAKE_FLAGS "-DLINK_LIBRARIES:STRING=raw1394;dc1394_control")
IF (argsIs11)
- SET (c1394CFlags "-DDC1394_DMA_SETUP_CAPTURE_ARGS=11")
+ SET (DC1394_DMA_SETUP_CAPTURE_ARGS 11)
ELSE (argsIs11)
FILE (WRITE ${testArgsSource}
- "#include \"libdc1394/dc1394_control.h\"\nint main ()
{dc1394_dma_setup_capture (NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL); return
0;}")
- TRY_COMPILE (argsIs12 ${CMAKE_CURRENT_BINARY_DIR}
${testArgsSource})
+ "#include \"libdc1394/dc1394_control.h\"\nint main ()
{dc1394_dma_setup_capture (NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL); return
0;}\n")
+ TRY_COMPILE (argsIs12 ${CMAKE_CURRENT_BINARY_DIR}
${testArgsSource} CMAKE_FLAGS "-DLINK_LIBRARIES:STRING=raw1394;dc1394_control")
IF (argsIs12)
- SET (c1394CFlags "-DDC1394_DMA_SETUP_CAPTURE_ARGS=12")
+ SET (DC1394_DMA_SETUP_CAPTURE_ARGS 12)
ENDIF (argsIs12)
ENDIF (argsIs11)
ENDIF (haveControlH)
ENDIF (build_camera1394)
-PLAYERDRIVER_ADD_DRIVER (camera1394 build_camera1394 LINKFLAGS
"${c1394LinkFlags}" CFLAGS "${c1394CFlags}" SOURCES ${c1394Sources})
+
+SET (camera1394_h_in "${CMAKE_CURRENT_SOURCE_DIR}/camera1394.h.in")
+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}" SOURCES ${c1394Sources}
${camera1394_h})
Modified: code/player/trunk/server/drivers/camera/1394/camera1394.cc
===================================================================
--- code/player/trunk/server/drivers/camera/1394/camera1394.cc 2008-07-01
18:50:43 UTC (rev 6723)
+++ code/player/trunk/server/drivers/camera/1394/camera1394.cc 2008-07-02
02:36:38 UTC (rev 6724)
@@ -158,10 +158,6 @@
*/
/** @} */
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
#include <errno.h>
#include <string.h>
#include <math.h>
@@ -170,6 +166,8 @@
#include <unistd.h>
#include <assert.h>
+#include <camera1394.h>
+
#ifdef HAVE_LIBRAW1394
#include <libraw1394/raw1394.h>
#endif
Added: code/player/trunk/server/drivers/camera/1394/camera1394.h.in
===================================================================
--- code/player/trunk/server/drivers/camera/1394/camera1394.h.in
(rev 0)
+++ code/player/trunk/server/drivers/camera/1394/camera1394.h.in
2008-07-02 02:36:38 UTC (rev 6724)
@@ -0,0 +1,2 @@
+#cmakedefine HAVE_LIBRAW1394 1
+#define DC1394_DMA_SETUP_CAPTURE_ARGS ${DC1394_DMA_SETUP_CAPTURE_ARGS}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
