added some missing includes, include directories and linking flags

git-svn-id: https://svn.mech.kuleuven.be/repos/orocos/orocos-components@6583 ce417995-dfc9-0310-95a0-acdaff106893
orocos-toolchain · Feb 12, 2007 · fdd8a72 · fdd8a72
1 parent 190e0b2
commit fdd8a72
Show file tree

Hide file tree

Showing 10 changed files with 249 additions and 278 deletions.
diff --git a/config/FindOpenCV.cmake b/config/FindOpenCV.cmake
diff --git a/config/check_depend.cmake b/config/check_depend.cmake
@@ -46,37 +46,13 @@ ELSE ( QT4 )
     MESSAGE("-- Looking for Qt4 >= 4.1 - not found")
 ENDIF ( QT4 )
 
-# Check for OpenCV
-FIND_LIBRARY( OPENCV NAMES opencv cv cv0.9 PATHS /usr/lib /usr/local/lib )
-IF ( OPENCV )
-    MESSAGE("-- Looking for OpenCV - found")
-ELSE ( OPENCV )
-    MESSAGE("-- Looking for OpenCV - not found")
-ENDIF ( OPENCV )
-
-# Check for CVAux
-FIND_LIBRARY( CVAUX NAMES cvaux cvaux0.9 PATHS /usr/lib /usr/local/lib )
-IF ( CVAUX )
-    MESSAGE("-- Looking for CVAux - found")
-ELSE ( CVAUX )
-    MESSAGE("-- Looking for CVAux - not found")
-ENDIF ( CVAUX )
-
-# Check for HighGUI
-FIND_LIBRARY( HIGHGUI NAMES highgui highgui0.9 PATHS /usr/lib /usr/local/lib )
-IF ( HIGHGUI )
-    MESSAGE("-- Looking for HighGUI - found")
-ELSE ( HIGHGUI )
-    MESSAGE("-- Looking for HighGUI - not found")
-ENDIF ( HIGHGUI )
-
 # Check for OpenCV-0.9.7
 INCLUDE (${PROJ_SOURCE_DIR}/config/FindOpenCV.cmake)
-IF ( OPENCV7 )
-    MESSAGE("-- Looking for OpenCV-0.9.7 - found")
-ELSE ( OPENCV7 )
-    MESSAGE("-- Looking for OpenCV-0.9.7 - not found")
-ENDIF ( OPENCV7 )
+IF ( OPENCV_FOUND )
+    MESSAGE("-- Looking for OpenCV - found")
+ELSE ( OPENCV_FOUND )
+    MESSAGE("-- Looking for OpenCV - not found")
+ENDIF ( OPENCV_FOUND )
 
 # Look for firewire headers (for firewire cameras)
 CHECK_INCLUDE_FILE_CXX( libdc1394/dc1394_control.h 1394 )

diff --git a/hardware/camera/CMakeLists.txt b/hardware/camera/CMakeLists.txt
@@ -1,4 +1,6 @@
-DEPENDENT_OPTION( BUILD_CAMERA "Build Camera Components" OFF "BUILD_HARDWARE" OFF)
+DEPENDENT_OPTION( BUILD_CAMERA "Build Camera Components" OFF "BUILD_HARDWARE;OpenCV_FOUND" OFF)
+
+MESSAGE("OPENCV_FOUND ${OPENCV_FOUND}")
 
 #Always process subdirs
 ADD_SUBDIRECTORY( tests )

diff --git a/hardware/camera/tests/CMakeLists.txt b/hardware/camera/tests/CMakeLists.txt
@@ -4,50 +4,28 @@ IF ( BUILD_TESTS)
 
 IF ( BUILD_CAMERA_TEST )
 
+INCLUDE(${PROJ_SOURCE_DIR}/config/FindGthread.cmake)
+INCLUDE(${PROJ_SOURCE_DIR}/config/FindGTK+-2.0.cmake)
+
+IF(GTHREAD_FOUND AND GTK_FOUND)
     # This gathers all the .cpp files into the variable 'SRCS'
     FILE( GLOB SRCS [^.]*.cpp )
 
     # Add a test program
     GLOBAL_ADD_TEST( camera ${SRCS} )
     # Use  TARGET_LINK_LIBRARIES( report libs... ) to add library deps.
-    TARGET_LINK_LIBRARIES( camera orocos-taskbrowser orocos-camera ${OROCOS_RTT_LIBS} ${OPENCV_LIBRARIES} libgthread-2.0.so.0 
-        libgtk-x11-2.0.so.0 
-        libgdk-x11-2.0.so.0 
-        libatk-1.0.so.0 
-        libpangocairo-1.0.so.0 
-        libpangoft2-1.0.so.0 
-        libXext.so.6 
-        libXinerama.so.1
-        libXi.so.6 
-        libXrandr.so.2 
-        libXcursor.so.1
-        libXfixes.so.3 
-        libpango-1.0.so.0 
-        libcairo.so.2 
-        libXrender.so.1
-        libfontconfig.so.1
-        libfreetype.so.6
-        libX11.so.6 
-        libgdk_pixbuf-2.0.so.0 
-        libgobject-2.0.so.0
-        libgmodule-2.0.so.0
-        libglib-2.0.so.0 
-        libpng12.so.0 
-        libtiff.so.4
-        libjpeg.so.62
-        libz.so.1 
-        libraw1394.so.5
-        libdc1394_control.so.13 
-        libdl.so.2 
-        libpthread.so.0
-        libstdc++.so.6 
-        libm.so.6 
-        libgcc_s.so.1
-        libc.so.6 
-        libXau.so.6 
-        libexpat.so.1 
+
+    TARGET_LINK_LIBRARIES( camera orocos-taskbrowser orocos-camera ${OROCOS_RTT_LIBS} ${OpenCV_LIBRARIES} ${OpenCV_LIBRARIES}
+      ${GTHREAD_LIBS} ${GTK_LIBS} 
+      jpeg
+      raw1394
+      dc1394_control
+      avcodec
+      avformat
 )
-
+ELSE(GTHREAD_FOUND AND GTK_FOUND)
+  MESSAGE(WARNING "Could not find needed libs for camera-test")
+ENDIF(GTHREAD_FOUND AND GTK_FOUND)
 
 ENDIF ( BUILD_CAMERA_TEST )
 ENDIF ( BUILD_TESTS)
diff --git a/motion_control/cartesian/CMakeLists.txt b/motion_control/cartesian/CMakeLists.txt
@@ -9,7 +9,7 @@ IF ( BUILD_CARTESIAN )
     FILE( GLOB SRCS [^.]*.cpp )
     FILE( GLOB HPPS [^.]*.hpp )
 
-    INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/motion_control/naxes )
+    INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/motion_control/naxes/ )
     GLOBAL_ADD_COMPONENT( orocos-cartesian ${SRCS} )
     GLOBAL_ADD_INCLUDE( ocl ${HPPS})
 

diff --git a/motion_control/cartesian/tests/CMakeLists.txt b/motion_control/cartesian/tests/CMakeLists.txt
@@ -9,8 +9,8 @@ IF ( BUILD_CARTESIAN_TEST )
     # Add a test program
     GLOBAL_ADD_TEST( cartesian ${SRCS} )
     # Use  TARGET_LINK_LIBRARIES( report libs... ) to add library deps.
-    INCLUDE_DIRECTORIES( ${PROJ_SOURCE_DIR}/hardware/axes ${PROJ_SOURCE_DIR}/hardware/comedi ${PROJ_SOURCE_DIR}/hardware/apci )
-    TARGET_LINK_LIBRARIES( cartesian orocos-taskbrowser orocos-reporting orocos-viewer orocos-cartesian orocos-naxes orocos-kuka orocos-axes ${KDL_LIBS} ${KDLTK_LIBS})
+    INCLUDE_DIRECTORIES( ${PROJ_SOURCE_DIR}/hardware/axes ${PROJ_SOURCE_DIR}/hardware/comedi ${PROJ_SOURCE_DIR}/hardware/apci ${PROJ_SOURCE_DIR}/motion_control/naxes )
+    TARGET_LINK_LIBRARIES( cartesian orocos-taskbrowser orocos-reporting orocos-viewer orocos-cartesian orocos-naxes orocos-kuka orocos-axes ${KDL_LIBS} ${KDLTK_LIBS} ACE)
 
     IF ( BUILD_COMEDI )
     TARGET_LINK_LIBRARIES( cartesian orocos-comedi )

diff --git a/motion_control/cartesian/tests/main.cpp b/motion_control/cartesian/tests/main.cpp
@@ -23,6 +23,7 @@
 
 #include <rtt/TaskContext.hpp>
 #include <rtt/os/main.h>
+#include <rtt/Activities.hpp>
 
 using namespace Orocos;
 using namespace RTT;

diff --git a/motion_control/naxes/tests/CMakeLists.txt b/motion_control/naxes/tests/CMakeLists.txt
@@ -10,7 +10,7 @@ IF ( BUILD_NAXES_TEST )
     INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/hardware/axes/ ${PROJECT_SOURCE_DIR}/hardware/comedi/ ${PROJECT_SOURCE_DIR}/hardware/apci/ )
     GLOBAL_ADD_TEST( naxes ${SRCS} )
     # Use  TARGET_LINK_LIBRARIES( report libs... ) to add library deps.
-    TARGET_LINK_LIBRARIES( naxes orocos-taskbrowser orocos-reporting orocos-naxes orocos-kuka orocos-axes orocos-viewer kdl )
+    TARGET_LINK_LIBRARIES( naxes orocos-taskbrowser orocos-reporting orocos-naxes orocos-kuka orocos-axes orocos-viewer kdl ACE )
 
     IF ( BUILD_COMEDI )
     TARGET_LINK_LIBRARIES( naxes orocos-comedi )

diff --git a/motion_control/naxes/tests/main.cpp b/motion_control/naxes/tests/main.cpp
@@ -29,7 +29,7 @@
 //nAxes components
 #include <motion_control/naxes/nAxesComponents.hpp>
 
-//#include <rtt/Activities.hpp>
+#include <rtt/Activities.hpp>
 #include <rtt/TaskContext.hpp>
 //#include <rtt/Logger.hpp>
 #include <rtt/os/main.h>

diff --git a/reporting/ReportingComponent.hpp b/reporting/ReportingComponent.hpp
@@ -215,7 +215,7 @@ namespace OCL
         RTT::Property<bool>          autotrigger;
         RTT::Property<std::string>   config;
         RTT::Property<bool>          writeHeader;
-
+                
         RTT::TimeService::ticks starttime;
         RTT::Property<RTT::TimeService::Seconds> timestamp;