Revision: 6387
http://playerstage.svn.sourceforge.net/playerstage/?rev=6387&view=rev
Author: gerkey
Date: 2008-04-28 13:22:20 -0700 (Mon, 28 Apr 2008)
Log Message:
-----------
fixed build of camera1394
Modified Paths:
--------------
code/player/trunk/server/drivers/camera/1394/CMakeLists.txt
Modified: code/player/trunk/server/drivers/camera/1394/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/camera/1394/CMakeLists.txt 2008-04-28
19:31:06 UTC (rev 6386)
+++ code/player/trunk/server/drivers/camera/1394/CMakeLists.txt 2008-04-28
20:22:20 UTC (rev 6387)
@@ -1,6 +1,6 @@
PLAYERDRIVER_OPTION (camera1394 build_camera1394 ON)
# PLAYERDRIVER_REQUIRE_LIB (camera1394 build_camera1394 raw1394 main "")
-SET (c1394CFlags "-DDC1394_DMA_SETUP_CAPTURE_ARGS=0")
+SET (c1394CFlags "-DDC1394_DMA_SETUP_CAPTURE_ARGS=0
-I${PROJECT_SOURCE_DIR}/server/drivers/blobfinder/cmvision")
IF (build_camera1394)
SET (c1394Sources camera1394.cc
${PROJECT_SOURCE_DIR}/server/drivers/blobfinder/cmvision/conversions.c)
@@ -18,6 +18,9 @@
SET (c1394LinkFlags "-lraw1394 -ldc1394_control")
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")
+ 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;}")
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
