Simplify rules, run tests

diff --git a/debian/control b/debian/control
index c91d6a7fe3873301d872f6cd1d3cf7fa6e3a81be..3458351545dbe3c041ab27d81a9cc676aa3c4b54 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -26,6 +26,8 @@ Build-Depends: debhelper-compat (= 13),
               libxi-dev,
               libpcap-dev,
               libvtk9-qt-dev,
+              libglew-dev,
+              libgtest-dev,
 Build-Depends-Indep: doxygen,
                     doxygen-latex
 Standards-Version: 4.6.0

diff --git a/debian/rules b/debian/rules
index a18ef4f2d6fb62c42e868366f58882be0c5016b4..b180d4792e48904b08842b96e8ded8ae9197220c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -14,43 +14,24 @@ else
   PARALLEL=
 endif
 
-.PHONY: override_dh_auto_configure \
-       override_dh_install \
-       override_dh_installchangelogs
-
 override_dh_auto_configure:
        dh_auto_configure --                                            \
        -DLIB_INSTALL_DIR:STRING="lib/$(DEB_HOST_MULTIARCH)"            \
        -DCMAKE_SKIP_RPATH=ON -DPCL_ENABLE_SSE=OFF                      \
-       -DBUILD_TESTS=OFF -DBUILD_apps=ON -DBUILD_common=ON             \
-       -DBUILD_examples=ON -DBUILD_features=ON -DBUILD_filters=ON      \
-       -DBUILD_geometry=ON -DBUILD_global_tests=OFF -DBUILD_io=ON      \
-       -DBUILD_kdtree=ON -DBUILD_keypoints=ON -DBUILD_octree=ON        \
-       -DBUILD_registration=ON -DBUILD_sample_consensus=ON             \
-       -DBUILD_search=ON -DBUILD_segmentation=ON -DBUILD_surface=ON    \
-       -DBUILD_tools=ON -DBUILD_tracking=ON -DBUILD_visualization=ON   \
-       -DBUILD_apps_cloud_composer=OFF -DBUILD_apps_modeler=ON            \
-       -DBUILD_apps_point_cloud_editor=ON -DBUILD_apps_in_hand_scanner=ON \
+       -DBUILD_apps_in_hand_scanner=ON \
+       -DBUILD_apps_modeler=ON \
+       -DBUILD_apps=ON \
+       -DBUILD_apps_point_cloud_editor=ON \
+       -DBUILD_global_tests=ON \
+       -DBUILD_TESTS=ON \
+       -DPCL_DISABLE_GPU_TESTS=ON \
        $(BUILD_DOC)
 
 #override_dh_shlibdeps:
 #      dh_shlibdeps -v -Xusr/bin/pcl_* -Lpcl-tools -l:$(CURDIR)/debian/usr/lib/${DEB_HOST_MULTIARCH}/cloud_composer_plugins: -ppcl --- -xpcl-tools -v
 
-override_dh_installchangelogs:
-       dh_installchangelogs -plibpcl-common1.11 CHANGES.md
-       # Creating dh_links to share the same file
-       @for i in libpcl-dev libpcl1.11 libpcl-apps1.11 \
-               libpcl-features1.11 libpcl-filters1.11 libpcl-io1.11 libpcl-kdtree1.11 \
-               libpcl-keypoints1.11 libpcl-octree1.11 libpcl-outofcore1.11 libpcl-people1.11 \
-               libpcl-recognition1.11 libpcl-registration1.11 libpcl-sample-consensus1.11 \
-               libpcl-search1.11 libpcl-segmentation1.11 libpcl-stereo1.11 \
-               libpcl-surface1.11 libpcl-tracking1.11 libpcl-visualization1.11 \
-               pcl-tools libpcl-doc; do \
-       cmd="dh_link -p$$i usr/share/doc/libpcl-common1.11/changelog.gz usr/share/doc/$$i/changelog.gz"; \
-       echo $$cmd; $$cmd; \
-       done
-       dh_installchangelogs
-
+override_dh_auto_test:
+       make -C obj-${DEB_HOST_GNU_TYPE} tests
 
 %:
-       dh  $@ $(PARALLEL) --builddirectory=build
+       dh  $@ $(PARALLEL)