Fix: Requires field of a .pc file should require library names not files

git-svn-id: svn+ssh://svn.pointclouds.org/pcl/trunk@209 a9d63959-f2ad-4865-b262-bf0e56cfafb6
timjr · Mar 24, 2011 · 215dcc9 · 215dcc9
1 parent fe1a3a0
commit 215dcc9
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 6 deletions.
diff --git a/cmake/pcl_find_boost.cmake b/cmake/pcl_find_boost.cmake
@@ -5,7 +5,14 @@ if(NOT PCL_SHARED_LIBS)
 endif(NOT PCL_SHARED_LIBS)
 
 find_package(Boost 1.44.0 COMPONENTS system filesystem thread)
-# TODO: What should the minimum version number be?
+
 include_directories(${Boost_INCLUDE_DIRS})
 link_directories(${Boost_LIBRARY_DIRS})
 
+foreach(boost_component ${Boost_LIBRARIES})
+  string(REGEX MATCH "boost_.*" component "${boost_component}")
+  if(NOT "${component}" EQUAL "")
+    string(REGEX REPLACE "(boost_.*)\\..*" "\\1" component "${component}")
+    list(APPEND boost_components ${component})
+  endif(NOT "${component}" EQUAL "")
+endforeach(boost_component)
diff --git a/features/CMakeLists.txt b/features/CMakeLists.txt
@@ -34,6 +34,7 @@ if(build)
     PCL_ADD_OPENMP_FLAGS(${LIB_NAME})
     target_link_libraries(${LIB_NAME} pcl_range_image ${Boost_LIBRARIES})
     PREFIX_LIST(EXT_DEPS pcl_ "${SUBSYS_DEPS}")
+    list(APPEND EXT_DEPS ${boost_components})
     PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}"
         "${EXT_DEPS}" "" "" "")
 

diff --git a/filters/CMakeLists.txt b/filters/CMakeLists.txt
@@ -24,6 +24,7 @@ if(build)
     target_link_libraries(${LIB_NAME} pcl_common pcl_sample_consensus
         pcl_kdtree ${Boost_LIBRARIES})
     PREFIX_LIST(EXT_DEPS pcl_ "${SUBSYS_DEPS}")
+    list(APPEND EXT_DEPS ${boost_components})
     PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}"
         "${EXT_DEPS}" "" "" "")
 

diff --git a/io/CMakeLists.txt b/io/CMakeLists.txt
@@ -48,7 +48,7 @@ if(build)
         target_link_libraries(${LIB_NAME} ${OPENNI_LIBRARIES})
     endif(OPENNI_FOUND)
     PREFIX_LIST(EXT_DEPS pcl_ "${SUBSYS_DEPS}")
-    list(APPEND EXT_DEPS ${Boost_FILESYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY})
+    list(APPEND EXT_DEPS boost_filesystem boost_thread)
     PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}"
         "${EXT_DEPS}" "" "" "")
 

diff --git a/kdtree/CMakeLists.txt b/kdtree/CMakeLists.txt
@@ -18,7 +18,7 @@ if(build)
     PCL_ADD_SSE_FLAGS(${LIB_NAME})
     target_link_libraries(${LIB_NAME} ${FLANN_LIBRARIES} ${Boost_LIBRARIES})
     PREFIX_LIST(EXT_DEPS pcl_ "${SUBSYS_DEPS}")
-    list(APPEND EXT_DEPS flann ${Boost_LIBRARIES})
+    list(APPEND EXT_DEPS flann ${boost_components})
     PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}"
         "${EXT_DEPS}" "" "" "")
 

diff --git a/registration/CMakeLists.txt b/registration/CMakeLists.txt
@@ -16,6 +16,7 @@ if(build)
     target_link_libraries(${LIB_NAME} pcl_kdtree pcl_sample_consensus
         ${Boost_LIBRARIES})
     PREFIX_LIST(EXT_DEPS pcl_ "${SUBSYS_DEPS}")
+    list(APPEND EXT_DEPS ${boost_components})
     PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}"
         "${EXT_DEPS}" "" "" "")
 

diff --git a/sample_consensus/CMakeLists.txt b/sample_consensus/CMakeLists.txt
@@ -33,7 +33,7 @@ if(build)
     PCL_ADD_SSE_FLAGS(${LIB_NAME})
     target_link_libraries(${LIB_NAME} ${Boost_LIBRARIES} ${CMINPACK_LIBRARIES})
     PREFIX_LIST(EXT_DEPS pcl_ "${SUBSYS_DEPS}")
-    list(APPEND EXT_DEPS ${Boost_LIBRARIES} cminpack)
+    list(APPEND EXT_DEPS ${boost_components} cminpack)
     PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}"
         "${EXT_DEPS}" "" "" "")
 

diff --git a/segmentation/CMakeLists.txt b/segmentation/CMakeLists.txt
@@ -20,6 +20,7 @@ if(build)
     target_link_libraries(${LIB_NAME} pcl_kdtree pcl_sample_consensus
         ${Boost_LIBRARIES})
     PREFIX_LIST(EXT_DEPS pcl_ "${SUBSYS_DEPS}")
+    list(APPEND EXT_DEPS ${boost_components})
     PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}"
         "${EXT_DEPS}" "" "" "")
 

diff --git a/surface/CMakeLists.txt b/surface/CMakeLists.txt
@@ -24,6 +24,7 @@ if(build)
     PCL_ADD_SSE_FLAGS(${LIB_NAME})
     target_link_libraries(${LIB_NAME} ${QHULL_LIBRARIES} ${Boost_LIBRARIES})
     PREFIX_LIST(EXT_DEPS pcl_ "${SUBSYS_DEPS}")
+    list(APPEND EXT_DEPS qhull ${boost_components})
     PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}"
         "${EXT_DEPS}" "" "" "")
 

diff --git a/visualization/CMakeLists.txt b/visualization/CMakeLists.txt
@@ -45,8 +45,15 @@ if(build)
     target_link_libraries(${LIB_NAME} ${wxWidgets_LIBRARIES}
         vtkCommon vtkWidgets vtkHybrid ${Boost_LIBRARIES})
     PREFIX_LIST(EXT_DEPS pcl_ "${SUBSYS_DEPS}")
-    list(APPEND EXT_DEPS ${wxWidgets_LIBRARIES} vtkCommon vtkWidgets
-        vtkHybrid ${Boost_LIBRARIES})
+    foreach(wx_component ${wxWidgets_LIBRARIES})
+      string(REGEX MATCH "wx.*" component "${wx_component}")
+      if(NOT "${component}" EQUAL "")
+        string(REGEX REPLACE "(wx.*)-[0-9\\.]+" "\\1" component "${component}")
+        list(APPEND wx_components ${component})
+      endif(NOT "${component}" EQUAL "")
+    endforeach(wx_component)
+    list(APPEND EXT_DEPS ${wx_components} vtkCommon vtkWidgets
+        vtkHybrid ${boost_components})
     PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}"
         "${EXT_DEPS}" "" "" "")