swt2c / rpms / mrpt

Forked from rpms/mrpt 5 years ago
Clone
Blob Blame History Raw
diff -up ./cmakemodules/script_pcl.cmake.pcl ./cmakemodules/script_pcl.cmake
--- ./cmakemodules/script_pcl.cmake.pcl	2013-09-08 16:43:49.006805758 +0000
+++ ./cmakemodules/script_pcl.cmake	2013-09-08 16:46:00.318251141 +0000
@@ -19,8 +19,8 @@ IF(NOT DISABLE_PCL)
 
 		INCLUDE_DIRECTORIES(${PCL_INCLUDE_DIRS})
 		link_directories(${PCL_LIBRARY_DIRS})
-		add_definitions(${PCL_DEFINITIONS})
-		
+		#add_definitions(${PCL_DEFINITIONS})
+		add_definitions(-DEIGEN_USE_NEW_STDVECTOR -DEIGEN_YES_I_KNOW_SPARSE_MODULE_IS_NOT_STABLE_YET)
 		IF (NOT Boost_FOUND)
 			MESSAGE("*MRPT ERROR MESSAGE*: PCL requires Boost. Either disable PCL (with DISABLE_PCL=ON) or, to fix the error, create the entries BOOST_ROOT and BOOST_LIBRARYDIR and set them to the correct values")
 		ENDIF (NOT Boost_FOUND)
diff -up ./libs/opengl/CMakeLists.txt.pcl ./libs/opengl/CMakeLists.txt
--- ./libs/opengl/CMakeLists.txt.pcl	2012-07-06 14:34:48.000000000 +0000
+++ ./libs/opengl/CMakeLists.txt	2013-09-08 16:42:30.250012627 +0000
@@ -29,7 +29,7 @@ ENDIF(WIN32)
 
 # Glext headers only (for Windows)
 INCLUDE_DIRECTORIES("${MRPT_SOURCE_DIR}/libs/opengl/src/glext")
-
+include_directories(${PCL_INCLUDE_DIRS})
 
 #---------------------------------------------
 # Macro declared in "DeclareMRPTLib.cmake":
diff -up ./libs/pbmap/CMakeLists.txt.pcl ./libs/pbmap/CMakeLists.txt
--- ./libs/pbmap/CMakeLists.txt.pcl	2013-02-27 18:08:17.000000000 +0000
+++ ./libs/pbmap/CMakeLists.txt	2013-09-08 16:42:30.250012627 +0000
@@ -15,6 +15,8 @@ define_mrpt_lib(
 	
 IF(BUILD_mrpt-pbmap)
 	target_link_libraries(mrpt-pbmap ${PCL_LIBRARIES})
+	include_directories(${PCL_INCLUDE_DIRS})
+	message(STATUS "PCL Iincludes: ${PCL_INCLUDE_DIRS}")
 ENDIF(BUILD_mrpt-pbmap)