Fixed bug in Point Set demo:

plug-ins with long name are not properly compiled (at least on CMake 2.6/VisualC++ 2005).

I am not sure if the bug is related to the plugin's name or to the full path.

The workaround is to use shorter names:
- "PS_demo_APSS_reconstruction_plugin" is renamed "PS_demo_APSS_plugin"
- "PS_demo_poisson_reconstruction_plugin" is renamed "PS_demo_poisson_plugin"
- "PS_demo_point_set_simplification_plugin" is renamed "PS_demo_simplification_plugin"

.gitattributes

@@ -3763,15 +3763,15 @@ Surface_mesher/find_debug_macros -text
 Surface_mesher/find_non_debug_macros -text
 Surface_mesher/test/Surface_mesher/combined_spheres.cin -text
 Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/MainWindow.ui -text
-Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_APSS_reconstruction_plugin.ui -text
+Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_APSS_plugin.ui -text
-Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_APSS_reconstruction_plugin_cgal_mc.cpp -text
+Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_APSS_plugin_cgal_mc.cpp -text
 Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_cleaning_plugin.cpp -text
 Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_cleaning_plugin.ui -text
 Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_local_spacing_plugin.cpp -text
 Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_normal_estimation_plugin.cpp -text
 Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_normal_estimation_plugin.ui -text
-Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_point_set_simplification_plugin.ui -text
+Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_poisson_plugin.ui -text
-Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_poisson_reconstruction_plugin.ui -text
+Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_simplification_plugin.ui -text
 Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_smoothing_plugin.cpp -text
 Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Point_set_demo.qrc -text
 Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/cgal_test_with_cmake eol=lf

.gitignore

@@ -479,6 +479,7 @@ Point_set_processing_3/include/CGAL/*.object_pool
 Point_set_processing_3/include/CGAL/*.pool
 Point_set_processing_3/include/CGAL/*.reserve_RAM
 Point_set_processing_3/include/CGAL/*.set_se_translator
+Point_set_processing_3/myrun_testsuite_with_cmake.bat
 Point_set_processing_3/test/Point_set_processing_3/*.kdev*
 Point_set_processing_3/test/Point_set_processing_3/*.ncb
 Point_set_processing_3/test/Point_set_processing_3/*.sln
@@ -796,6 +797,7 @@ Surface_reconstruction_points_3/include/CGAL/*.object_pool
 Surface_reconstruction_points_3/include/CGAL/*.pool
 Surface_reconstruction_points_3/include/CGAL/*.reserve_RAM
 Surface_reconstruction_points_3/include/CGAL/*.set_se_translator
+Surface_reconstruction_points_3/myrun_testsuite_with_cmake.bat
 Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/*.kdev*
 Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/*.ncb
 Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/*.sln

Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/CMakeLists.txt

@@ -235,21 +235,21 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)
     target_link_libraries( ${plugin_name} ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} )
   endmacro(polyhedron_demo_plugin)
 
-  qt4_wrap_ui( APSS_UI_FILES PS_demo_APSS_reconstruction_plugin.ui)
+  qt4_wrap_ui( APSS_UI_FILES PS_demo_APSS_plugin.ui)
-  polyhedron_demo_plugin(PS_demo_APSS_reconstruction_plugin
+  polyhedron_demo_plugin(PS_demo_APSS_plugin
-    PS_demo_APSS_reconstruction_plugin
+    PS_demo_APSS_plugin
-    PS_demo_APSS_reconstruction_plugin_cgal_code.cpp
+    PS_demo_APSS_plugin_cgal_code.cpp
-    PS_demo_APSS_reconstruction_plugin_cgal_mc.cpp
+    PS_demo_APSS_plugin_cgal_mc.cpp
     ${APSS_UI_FILES})
-  target_link_libraries(PS_demo_APSS_reconstruction_plugin scene_polyhedron_item point_set)
+  target_link_libraries(PS_demo_APSS_plugin scene_polyhedron_item point_set)
 
   if(TAUCS_FOUND)
-    qt4_wrap_ui( POISSON_UI_FILES PS_demo_poisson_reconstruction_plugin.ui)
+    qt4_wrap_ui( POISSON_UI_FILES PS_demo_poisson_plugin.ui)
-    polyhedron_demo_plugin(PS_demo_poisson_reconstruction_plugin
+    polyhedron_demo_plugin(PS_demo_poisson_plugin
-      PS_demo_poisson_reconstruction_plugin
+      PS_demo_poisson_plugin
-      PS_demo_poisson_reconstruction_plugin_cgal_code.cpp
+      PS_demo_poisson_plugin_cgal_code.cpp
       ${POISSON_UI_FILES})
-    target_link_libraries(PS_demo_poisson_reconstruction_plugin scene_polyhedron_item point_set)
+    target_link_libraries(PS_demo_poisson_plugin scene_polyhedron_item point_set)
   endif()
 
   polyhedron_demo_plugin(Polyhedron_demo_inside_out_plugin Polyhedron_demo_inside_out_plugin)
@@ -261,11 +261,11 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)
   polyhedron_demo_plugin(PS_demo_xyz_plugin PS_demo_xyz_plugin)
   target_link_libraries(PS_demo_xyz_plugin scene_polyhedron_item point_set)
 
-  qt4_wrap_ui(SIMPLIFICATION_UI_FILES PS_demo_point_set_simplification_plugin.ui)
+  qt4_wrap_ui(SIMPLIFICATION_UI_FILES PS_demo_simplification_plugin.ui)
-  polyhedron_demo_plugin(PS_demo_point_set_simplification_plugin
+  polyhedron_demo_plugin(PS_demo_simplification_plugin
-    PS_demo_point_set_simplification_plugin
+    PS_demo_simplification_plugin
     ${SIMPLIFICATION_UI_FILES})
-  target_link_libraries(PS_demo_point_set_simplification_plugin point_set)
+  target_link_libraries(PS_demo_simplification_plugin point_set)
 
   polyhedron_demo_plugin(PS_demo_local_spacing_plugin PS_demo_local_spacing_plugin)
   target_link_libraries(PS_demo_local_spacing_plugin point_set)

Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_APSS_plugin.cpp

@@ -11,7 +11,7 @@
 #include <QtPlugin>
 #include <QInputDialog>
 
-#include "ui_PS_demo_APSS_reconstruction_plugin.h"
+#include "ui_PS_demo_APSS_plugin.h"
 
 // APSS reconstruction method:
 // Reconstructs a surface mesh from a point set and returns it as a polyhedron.
@@ -26,7 +26,7 @@ Polyhedron* APSS_reconstruct_mc(const Point_set& points,
                                 FT smoothness, // Smoothness factor. In the range 2 (clean datasets) and 8 (noisy datasets).
                                 int grid_size); // size of the grid
 
-class PS_demo_APSS_reconstruction_plugin :
+class PS_demo_APSS_plugin :
   public QObject,
   protected Polyhedron_demo_plugin_helper
 {
@@ -54,14 +54,14 @@ public slots:
 private:
   QAction* actionAPSSReconstruction;
 
-}; // end class PS_demo_APSS_reconstruction_plugin
+}; // end class PS_demo_APSS_plugin
 
 
-class PS_demo_APSS_reconstruction_plugin_dialog : public QDialog, private Ui::ApssDialog
+class PS_demo_APSS_plugin_dialog : public QDialog, private Ui::ApssDialog
 {
   Q_OBJECT
   public:
-    PS_demo_APSS_reconstruction_plugin_dialog(QWidget *parent = 0)
+    PS_demo_APSS_plugin_dialog(QWidget *parent = 0)
     {
       setupUi(this);
     }
@@ -79,7 +79,7 @@ class PS_demo_APSS_reconstruction_plugin_dialog : public QDialog, private Ui::Ap
     }
 };
 
-void PS_demo_APSS_reconstruction_plugin::reconstruct()
+void PS_demo_APSS_plugin::reconstruct()
 {
   const Scene_interface::Item_id index = scene->mainSelectionIndex();
 
@@ -93,7 +93,7 @@ void PS_demo_APSS_reconstruction_plugin::reconstruct()
     if(!points) return;
 
     // Gets options
-    PS_demo_APSS_reconstruction_plugin_dialog dialog;
+    PS_demo_APSS_plugin_dialog dialog;
     if(!dialog.exec())
       return;
     const double sm_angle     = dialog.triangleAngle();
@@ -140,6 +140,6 @@ void PS_demo_APSS_reconstruction_plugin::reconstruct()
   }
 }
 
-Q_EXPORT_PLUGIN2(PS_demo_APSS_reconstruction_plugin, PS_demo_APSS_reconstruction_plugin);
+Q_EXPORT_PLUGIN2(PS_demo_APSS_plugin, PS_demo_APSS_plugin);
 
-#include "PS_demo_APSS_reconstruction_plugin.moc"
+#include "PS_demo_APSS_plugin.moc"

Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_poisson_plugin.cpp

@@ -11,7 +11,7 @@
 #include <QtPlugin>
 #include <QInputDialog>
 
-#include "ui_PS_demo_poisson_reconstruction_plugin.h"
+#include "ui_PS_demo_poisson_plugin.h"
 
 // Poisson reconstruction method:
 // Reconstructs a surface mesh from a point set and returns it as a polyhedron.
@@ -20,7 +20,7 @@ Polyhedron* poisson_reconstruct(const Point_set& points,
                                 FT sm_radius, // Max triangle radius w.r.t. point set radius. 0.1 is fine.
                                 FT sm_distance); // Approximation error w.r.t. p.s.r.. For Poisson: 0.015=fast, 0.003=smooth.
 
-class PS_demo_poisson_reconstruction_plugin :
+class PS_demo_poisson_plugin :
   public QObject,
   protected Polyhedron_demo_plugin_helper
 {
@@ -48,14 +48,14 @@ public slots:
 private:
   QAction* actionPoissonReconstruction;
 
-}; // end class PS_demo_poisson_reconstruction_plugin
+}; // end class PS_demo_poisson_plugin
 
 
-class PS_demo_poisson_reconstruction_plugin_dialog : public QDialog, private Ui::PoissonDialog
+class PS_demo_poisson_plugin_dialog : public QDialog, private Ui::PoissonDialog
 {
   Q_OBJECT
   public:
-    PS_demo_poisson_reconstruction_plugin_dialog(QWidget *parent = 0)
+    PS_demo_poisson_plugin_dialog(QWidget *parent = 0)
     {
       setupUi(this);
     }
@@ -65,7 +65,7 @@ class PS_demo_poisson_reconstruction_plugin_dialog : public QDialog, private Ui:
     double triangleError() const { return m_inputDistance->value(); }
 };
 
-void PS_demo_poisson_reconstruction_plugin::reconstruct()
+void PS_demo_poisson_plugin::reconstruct()
 {
   const Scene_interface::Item_id index = scene->mainSelectionIndex();
 
@@ -79,7 +79,7 @@ void PS_demo_poisson_reconstruction_plugin::reconstruct()
     if(!points) return;
 
     // Gets options
-    PS_demo_poisson_reconstruction_plugin_dialog dialog;
+    PS_demo_poisson_plugin_dialog dialog;
     if(!dialog.exec())
       return;
     const double sm_angle     = dialog.triangleAngle();
@@ -111,6 +111,6 @@ void PS_demo_poisson_reconstruction_plugin::reconstruct()
   }
 }
 
-Q_EXPORT_PLUGIN2(PS_demo_poisson_reconstruction_plugin, PS_demo_poisson_reconstruction_plugin);
+Q_EXPORT_PLUGIN2(PS_demo_poisson_plugin, PS_demo_poisson_plugin);
 
-#include "PS_demo_poisson_reconstruction_plugin.moc"
+#include "PS_demo_poisson_plugin.moc"

Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_simplification_plugin.cpp

@@ -16,9 +16,9 @@
 #include <QInputDialog>
 #include <QMessageBox>
 
-#include "ui_PS_demo_point_set_simplification_plugin.h"
+#include "ui_PS_demo_simplification_plugin.h"
 
-class PS_demo_point_set_simplification_plugin :
+class PS_demo_simplification_plugin :
   public QObject,
   public Polyhedron_demo_plugin_helper
 {
@@ -44,7 +44,7 @@ public:
 public slots:
   void on_actionSimplify_triggered();
 
-}; // end PS_demo_point_set_simplification_plugin
+}; // end PS_demo_simplification_plugin
 
 class Point_set_demo_point_set_simplification_dialog : public QDialog, private Ui::PointSetSimplificationDialog
 {
@@ -60,7 +60,7 @@ class Point_set_demo_point_set_simplification_dialog : public QDialog, private U
     float gridCellSize() const { return m_gridCellSize->value(); }
 };
 
-void PS_demo_point_set_simplification_plugin::on_actionSimplify_triggered()
+void PS_demo_simplification_plugin::on_actionSimplify_triggered()
 {
   const Scene_interface::Item_id index = scene->mainSelectionIndex();
 
@@ -136,6 +136,6 @@ void PS_demo_point_set_simplification_plugin::on_actionSimplify_triggered()
   }
 }
 
-Q_EXPORT_PLUGIN2(PS_demo_point_set_simplification_plugin, PS_demo_point_set_simplification_plugin);
+Q_EXPORT_PLUGIN2(PS_demo_simplification_plugin, PS_demo_simplification_plugin);
 
-#include "PS_demo_point_set_simplification_plugin.moc"
+#include "PS_demo_simplification_plugin.moc"

Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/cgal_test_with_cmake

@@ -173,8 +173,8 @@ else
     compile_and_run Polyhedron_demo_inside_out_plugin
     [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
   fi
-  if [ `can_compile PS_demo_APSS_reconstruction_plugin` == "y" ]; then
+  if [ `can_compile PS_demo_APSS_plugin` == "y" ]; then
-    compile_and_run PS_demo_APSS_reconstruction_plugin
+    compile_and_run PS_demo_APSS_plugin
     [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
   fi
   if [ `can_compile PS_demo_average_spacing_plugin` == "y" ]; then
@@ -197,12 +197,12 @@ else
     compile_and_run PS_demo_off_plugin
     [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
   fi
-  if [ `can_compile PS_demo_point_set_simplification_plugin` == "y" ]; then
+  if [ `can_compile PS_demo_simplification_plugin` == "y" ]; then
-    compile_and_run PS_demo_point_set_simplification_plugin
+    compile_and_run PS_demo_simplification_plugin
     [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
   fi
-  if [ `can_compile PS_demo_poisson_reconstruction_plugin` == "y" ]; then
+  if [ `can_compile PS_demo_poisson_plugin` == "y" ]; then
-    compile_and_run PS_demo_poisson_reconstruction_plugin
+    compile_and_run PS_demo_poisson_plugin
     [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
   fi
   if [ `can_compile PS_demo_smoothing_plugin` == "y" ]; then