diff options
| author | cjamin <cjamin@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-06-21 15:15:25 +0000 |
|---|---|---|
| committer | cjamin <cjamin@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-06-21 15:15:25 +0000 |
| commit | 091796c9be3ac7ddaa96bacc71842a2808da14e4 (patch) | |
| tree | 482d533db8249c8f08df223ef859ce68db83196c | |
| parent | 771ed07022c60a3070439f31b60e3c964fdaba87 (diff) | |
Use namespace + improve CMakeLists.txt
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/subsampling_and_spatialsearching@1326 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 7481553ea143479fa48b3722370b3d031ad8175a
| -rw-r--r-- | src/Subsampling/include/gudhi/sparsify_point_set.h | 6 | ||||
| -rw-r--r-- | src/Subsampling/test/CMakeLists.txt | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/Subsampling/include/gudhi/sparsify_point_set.h b/src/Subsampling/include/gudhi/sparsify_point_set.h index bd7f4c56..62b1b4b6 100644 --- a/src/Subsampling/include/gudhi/sparsify_point_set.h +++ b/src/Subsampling/include/gudhi/sparsify_point_set.h @@ -40,9 +40,9 @@ sparsify_point_set( const Kernel &k, Point_container const& input_pts, typename Kernel::FT min_squared_dist, OutputIterator output_it) -{ - typedef typename Gudhi::Spatial_tree_data_structure< - Kernel, Point_container> Points_ds; +{ + typedef typename Gudhi::spatial_searching::Spatial_tree_data_structure< + Kernel, Point_container> Points_ds; typename Kernel::Squared_distance_d sqdist = k.squared_distance_d_object(); diff --git a/src/Subsampling/test/CMakeLists.txt b/src/Subsampling/test/CMakeLists.txt index 6fd70e39..80b0ccbb 100644 --- a/src/Subsampling/test/CMakeLists.txt +++ b/src/Subsampling/test/CMakeLists.txt @@ -10,7 +10,6 @@ if (GPROF_PATH) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg") endif() -# Landmarking test if(CGAL_FOUND) if (NOT CGAL_VERSION VERSION_LESS 4.8.0) message(STATUS "CGAL version: ${CGAL_VERSION}.") @@ -32,6 +31,8 @@ if(CGAL_FOUND) message(WARNING "Eigen3 not found. Version 3.1.0 is required for Subsampling feature.") endif() else() - message(WARNING "CGAL version: ${CGAL_VERSION} is too old to compile Landmarking feature. Version 4.8.0 is required.") + message(WARNING "CGAL version: ${CGAL_VERSION} is too old to compile Subsampling tests. Version 4.8.0 is required.") endif () +else() + message(WARNING "CGAL not found. It is required for the Subsampling tests.") endif() |