- enabled vtk support

diff --git a/pcl.spec b/pcl.spec
index 6dfa77baa0bde31f406869fb7baaf26b933e9535..02f76a79a1966dd34f5043ae399d82f8fb830346 100644 (file)
--- a/pcl.spec
+++ b/pcl.spec
@@ -1,7 +1,8 @@
-# TODO: VTK, MPI, ROS?
+# TODO: MPI, ROS?
 #
 # Conditional build:
-%bcond_without apidocs         # do not build and package API docs
+%bcond_without apidocs # do not build and package API docs
+%bcond_without vtk     # VTK support in libpcl_{io,surface} + libpcl_{apps,visualization} libs
 #
 Summary:       Point Cloud Library - library for point cloud processing
 Summary(pl.UTF-8):     Point Cloud Library - biblioteka do operacji na chmurze punktów
@@ -16,8 +17,8 @@ Source0:      http://www.pointclouds.org/assets/files/1.6.0/PCL-%{version}-Source.tar
 Patch0:                %{name}-link.patch
 URL:           http://pointclouds.org/
 BuildRequires: OpenNI-devel
-BuildRequires: boost-devel
-BuildRequires: cmake
+BuildRequires: boost-devel >= 1.40
+BuildRequires: cmake >= 2.8
 BuildRequires: eigen3 >= 3
 BuildRequires: flann-devel
 BuildRequires: gcc-c++ >= 6:4.2
@@ -27,6 +28,12 @@ BuildRequires:       libusb-devel >= 1.0
 BuildRequires: qhull-devel
 BuildRequires: python
 BuildRequires: sed >= 4.0
+# FIXME: only vtk-devel is really required, the rest only because of checks in VTK cmake files
+%{?with_vtk:BuildRequires:     vtk-devel}
+%{?with_vtk:BuildRequires:     vtk-java}
+%{?with_vtk:BuildRequires:     vtk-python}
+%{?with_vtk:BuildRequires:     vtk-python-qt}
+%{?with_vtk:BuildRequires:     vtk-tcl}
 %if %{with apidocs}
 BuildRequires: doxygen
 BuildRequires: python-sphinxcontrib-doxylink >= 1.3
@@ -60,6 +67,7 @@ Summary:      Header files for PCL library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki PCL
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+%{?with_vtk:Requires:  vtk-devel}
 
 %description devel
 Header files for PCL library.
@@ -122,6 +130,75 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/pcl_ply2ply
 %attr(755,root,root) %{_bindir}/pcl_ply2raw
 %attr(755,root,root) %{_bindir}/pcl_plyheader
+%if %{with vtk}
+%attr(755,root,root) %{_bindir}/oni_viewer
+%attr(755,root,root) %{_bindir}/openni_fast_mesh
+%attr(755,root,root) %{_bindir}/openni_ii_normal_estimation
+%attr(755,root,root) %{_bindir}/openni_image
+%attr(755,root,root) %{_bindir}/openni_viewer
+%attr(755,root,root) %{_bindir}/openni_voxel_grid
+%attr(755,root,root) %{_bindir}/pcd_grabber_viewer
+%attr(755,root,root) %{_bindir}/pcd_viewer
+%attr(755,root,root) %{_bindir}/pcl_add_gaussian_noise
+%attr(755,root,root) %{_bindir}/pcl_boundary_estimation
+%attr(755,root,root) %{_bindir}/pcl_cluster_extraction
+%attr(755,root,root) %{_bindir}/pcl_compute_cloud_error
+%attr(755,root,root) %{_bindir}/pcl_crop_to_hull
+%attr(755,root,root) %{_bindir}/pcl_elch
+%attr(755,root,root) %{_bindir}/pcl_extract_feature
+%attr(755,root,root) %{_bindir}/pcl_feature_matching
+%attr(755,root,root) %{_bindir}/pcl_fpfh_estimation
+%attr(755,root,root) %{_bindir}/pcl_gp3_surface
+%attr(755,root,root) %{_bindir}/pcl_icp
+%attr(755,root,root) %{_bindir}/pcl_icp2d
+%attr(755,root,root) %{_bindir}/pcl_marching_cubes_reconstruction
+%attr(755,root,root) %{_bindir}/pcl_mesh2pcd
+%attr(755,root,root) %{_bindir}/pcl_mesh_sampling
+%attr(755,root,root) %{_bindir}/pcl_mls_smoothing
+%attr(755,root,root) %{_bindir}/pcl_multiscale_feature_persistence_example
+%attr(755,root,root) %{_bindir}/pcl_nn_classification_example
+%attr(755,root,root) %{_bindir}/pcl_normal_estimation
+%attr(755,root,root) %{_bindir}/pcl_octree_viewer
+%attr(755,root,root) %{_bindir}/pcl_openni_3d_concave_hull
+%attr(755,root,root) %{_bindir}/pcl_openni_3d_convex_hull
+%attr(755,root,root) %{_bindir}/pcl_openni_boundary_estimation
+%attr(755,root,root) %{_bindir}/pcl_openni_change_viewer
+%attr(755,root,root) %{_bindir}/pcl_openni_fast_mesh
+%attr(755,root,root) %{_bindir}/pcl_openni_feature_persistence
+%attr(755,root,root) %{_bindir}/pcl_openni_floodfill_planar_segmentation
+%attr(755,root,root) %{_bindir}/pcl_openni_grab_frame
+%attr(755,root,root) %{_bindir}/pcl_openni_ii_normal_estimation
+%attr(755,root,root) %{_bindir}/pcl_openni_mls_smoothing
+%attr(755,root,root) %{_bindir}/pcl_openni_organized_multi_plane_segmentation
+%attr(755,root,root) %{_bindir}/pcl_openni_planar_convex_hull
+%attr(755,root,root) %{_bindir}/pcl_openni_planar_segmentation
+%attr(755,root,root) %{_bindir}/pcl_openni_save_image
+%attr(755,root,root) %{_bindir}/pcl_openni_stream_compression
+%attr(755,root,root) %{_bindir}/pcl_openni_tracking
+%attr(755,root,root) %{_bindir}/pcl_openni_uniform_sampling
+%attr(755,root,root) %{_bindir}/pcl_openni_voxel_grid
+%attr(755,root,root) %{_bindir}/pcl_outlier_removal
+%attr(755,root,root) %{_bindir}/pcl_passthrough_filter
+%attr(755,root,root) %{_bindir}/pcl_pcd2ply
+%attr(755,root,root) %{_bindir}/pcl_pcd2vtk
+%attr(755,root,root) %{_bindir}/pcl_pcd_organized_multi_plane_segmentation
+%attr(755,root,root) %{_bindir}/pcl_plane_projection
+%attr(755,root,root) %{_bindir}/pcl_ply2pcd
+%attr(755,root,root) %{_bindir}/pcl_poisson_reconstruction
+%attr(755,root,root) %{_bindir}/pcl_ppf_object_recognition
+%attr(755,root,root) %{_bindir}/pcl_pyramid_surface_matching
+%attr(755,root,root) %{_bindir}/pcl_registration_visualizer
+%attr(755,root,root) %{_bindir}/pcl_spin_estimation
+%attr(755,root,root) %{_bindir}/pcl_statistical_multiscale_interest_region_extraction_example
+%attr(755,root,root) %{_bindir}/pcl_surfel_smoothing_test
+%attr(755,root,root) %{_bindir}/pcl_test_search_speed
+%attr(755,root,root) %{_bindir}/pcl_transform_from_viewpoint
+%attr(755,root,root) %{_bindir}/pcl_transform_point_cloud
+%attr(755,root,root) %{_bindir}/pcl_vfh_estimation
+%attr(755,root,root) %{_bindir}/pcl_virtual_scanner
+%attr(755,root,root) %{_bindir}/pcl_voxel_grid
+%attr(755,root,root) %{_bindir}/timed_trigger_test
+%endif
 %attr(755,root,root) %{_libdir}/libpcl_common.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libpcl_common.so.1.6
 %attr(755,root,root) %{_libdir}/libpcl_features.so.*.*.*
@@ -152,6 +229,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libpcl_surface.so.1.6
 %attr(755,root,root) %{_libdir}/libpcl_tracking.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libpcl_tracking.so.1.6
+%if %{with vtk}
+%attr(755,root,root) %{_libdir}/libpcl_apps.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpcl_apps.so.1.6
+%attr(755,root,root) %{_libdir}/libpcl_visualization.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpcl_visualization.so.1.6
+%endif
 
 %files devel
 %defattr(644,root,root,755)
@@ -170,6 +253,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libpcl_segmentation.so
 %attr(755,root,root) %{_libdir}/libpcl_surface.so
 %attr(755,root,root) %{_libdir}/libpcl_tracking.so
+%if %{with vtk}
+%attr(755,root,root) %{_libdir}/libpcl_apps.so
+%attr(755,root,root) %{_libdir}/libpcl_visualization.so
+%endif
 %{_includedir}/pcl-1.6
 %{_pkgconfigdir}/pcl_common-1.6.pc
 %{_pkgconfigdir}/pcl_features-1.6.pc
@@ -185,6 +272,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/pcl_segmentation-1.6.pc
 %{_pkgconfigdir}/pcl_surface-1.6.pc
 %{_pkgconfigdir}/pcl_tracking-1.6.pc
+%if %{with vtk}
+%{_pkgconfigdir}/pcl_apps-1.6.pc
+%{_pkgconfigdir}/pcl_visualization-1.6.pc
+%endif
 %dir %{_datadir}/pcl-1.6
 %{_datadir}/pcl-1.6/PCLConfig*.cmake