diff --git a/pcl-1.5.1-pthread.patch b/pcl-1.5.1-pthread.patch new file mode 100644 index 0000000..c20b0d2 --- /dev/null +++ b/pcl-1.5.1-pthread.patch @@ -0,0 +1,12 @@ +diff -up ./cmake/pcl_targets.cmake.f16 ./cmake/pcl_targets.cmake +--- ./cmake/pcl_targets.cmake.f16 2012-04-22 19:28:18.422210510 -0400 ++++ ./cmake/pcl_targets.cmake 2012-04-22 19:28:36.767897609 -0400 +@@ -306,7 +306,7 @@ macro(PCL_ADD_TEST _name _exename) + if(NOT WIN32) + set_target_properties(${_exename} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + endif(NOT WIN32) +- target_link_libraries(${_exename} ${GTEST_BOTH_LIBRARIES} ${PCL_ADD_TEST_LINK_WITH}) ++ target_link_libraries(${_exename} ${GTEST_BOTH_LIBRARIES} pthread ${PCL_ADD_TEST_LINK_WITH}) + # + # Only link if needed + if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") diff --git a/pcl.spec b/pcl.spec index 63fbecc..4e69779 100644 --- a/pcl.spec +++ b/pcl.spec @@ -9,6 +9,7 @@ URL: http://pointclouds.org/ Source0: http://dev.pointclouds.org/attachments/download/771/PCL-1.5.1-Source.tar.bz2 Patch0: PCL-1.4.0-Source-fedora.patch Patch1: pcl-1.5.1-gcc47.patch +Patch2: pcl-1.5.1-pthread.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # For plain building @@ -75,6 +76,7 @@ Library. %setup -q -n PCL-%{version}-Source %patch0 -p1 %patch1 -p0 +%patch2 -p0 # Just to make it obvious we're not using any of these rm -rf 3rdparty @@ -184,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Apr 22 2012 Rich Mattes - 1.5.2-2 +- Add patch to fix gtest linking error + * Thu Apr 19 2012 Tim Niemueller - 1.5.1-2 - Pass proper LIB_INSTALL_DIR, install wrong cmake files otherwise