fix compilation of 3d_rec_framework after metslib change

wflohry · Dec 18, 2013 · 1e0e852 · 1e0e852
1 parent 9be1f36
commit 1e0e852
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -275,6 +275,9 @@ if (PKG_CONFIG_FOUND)
   pkg_check_modules(METSLIB metslib)
   if (METSLIB_FOUND)
     set (HAVE_METSLIB ON)
+    include_directories(${METSLIB_INCLUDE_DIRS})
+  else()
+    include_directories(${PCL_SOURCE_DIR}/recognition/include/pcl/recognition/3rdparty/)
   endif()
 endif()
 

diff --git a/recognition/CMakeLists.txt b/recognition/CMakeLists.txt
@@ -149,11 +149,6 @@ if(build)
 
     set(LIB_NAME pcl_${SUBSYS_NAME})
     include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
-    if (HAVE_METSLIB)
-        include_directories(${METSLIB_INCLUDE_DIRS})
-    else(HAVE_METSLIB)
-        include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/pcl/recognition/3rdparty/)
-    endif(HAVE_METSLIB)
     PCL_ADD_LIBRARY(${LIB_NAME} ${SUBSYS_NAME} ${srcs} ${incs} ${impl_incs} ${face_detection_incs} ${ransac_based_incs} ${ransac_based_impl_incs} ${hv_incs} ${hv_impl_incs} ${cg_incs} ${cg_impl_incs} ${metslib_incs})
     target_link_libraries(${LIB_NAME} pcl_common pcl_kdtree pcl_octree pcl_search pcl_features pcl_registration pcl_sample_consensus pcl_filters pcl_ml pcl_io)
     PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}" "${SUBSYS_DEPS}" "" "" "" "")