[Jderobot-admin] jderobot-r996 - in trunk: . Deps/pcl

[frivas en jderobot.org]

Author: frivas
Date: 2013-10-05 20:26:49 +0200 (Sat, 05 Oct 2013)
New Revision: 996

Modified:
   trunk/CMakeLists.txt
   trunk/Deps/pcl/CMakeLists.txt
Log:
Issue #60 included pcl-1.7 support


Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2013-10-05 17:29:47 UTC (rev 995)
+++ trunk/CMakeLists.txt	2013-10-05 18:26:49 UTC (rev 996)
@@ -101,9 +101,12 @@
 include_directories(${gstreamerapp_INCLUDE_DIRS})
 link_directories(${gstreamerapp_LIBRARY_DIRS})
 
+PKG_CHECK_MODULES(eigen REQUIRED eigen3)
+include_directories(${eigen_INCLUDE_DIRS})
 
 
 
+
 FOREACH(LibFile ${LIBS_NEEDED})
     link_directories(${LIBS_DIR}/${LibFile})
     MESSAGE("${LIBS_DIR}/${LibFile}")

Modified: trunk/Deps/pcl/CMakeLists.txt
===================================================================
--- trunk/Deps/pcl/CMakeLists.txt	2013-10-05 17:29:47 UTC (rev 995)
+++ trunk/Deps/pcl/CMakeLists.txt	2013-10-05 18:26:49 UTC (rev 996)
@@ -1,18 +1,6 @@
 # CHECK PCL
-FIND_PATH( pcl_INCLUDE_DIR1 NAMES point_cloud.h PATHS ENV C++LIB ENV PATH PATH_SUFFIXES include/pcl-1.5/ )
-FIND_PATH( pcl_INCLUDE_DIR2 NAMES pcl PATHS ENV C++LIB ENV PATH PATH_SUFFIXES include/pcl-1.6/ )
-IF ((pcl_INCLUDE_DIR1) AND (pcl_INCLUDE_DIR2))
-	SET (pcl_INCLUDE_DIR ${pcl_INCLUDE_DIR1} ${pcl_INCLUDE_DIR2})
-ELSE ((pcl_INCLUDE_DIR1) AND (pcl_INCLUDE_DIR2))
-	IF (pcl_INCLUDE_DIR1)
-		SET (pcl_INCLUDE_DIR ${pcl_INCLUDE_DIR1})
-	ENDIF(pcl_INCLUDE_DIR1)
+FIND_PATH( pcl_INCLUDE_DIR NAMES point_cloud.h PATHS ENV C++LIB ENV PATH PATH_SUFFIXES include/pcl-1.5/ include/pcl-1.6/ include/pcl-1.7/ )
 
-	IF (pcl_INCLUDE_DIR2)
-		SET (pcl_INCLUDE_DIR ${pcl_INCLUDE_DIR2})
-	ENDIF(pcl_INCLUDE_DIR2)
-ENDIF ((pcl_INCLUDE_DIR1) AND (pcl_INCLUDE_DIR2))
-
 #MESSAGE("PCL LIBRARY FOUND IN ${pcl_INCLUDE_DIR}")
 FIND_LIBRARY(with_pcl
     NAMES pcl_surface pcl_registration pcl_segmentation pcl_filters pcl_sample_consensus pcl_io pcl_octree pcl_features pcl_kdtree pcl_common