Fix attempt of git problem + Periodic_3_triangulation_3 and Periodic_Llyod_3 demonstrations ported.

Installation/cmake/modules/FindQt5.cmake

@@ -35,6 +35,111 @@ FOREACH(module Core GUI OpenGL Multimedia
   
 ENDFOREACH(module)
 
+  #######################################
+  #
+  #       Check the executables of Qt 
+  #          ( moc, uic, rcc )
+  #         Same as Qt4 version  
+  #
+  #######################################
+
+
+  IF(QT_QMAKE_CHANGED)
+    SET(QT_UIC_EXECUTABLE NOTFOUND)
+    SET(QT_MOC_EXECUTABLE NOTFOUND)
+    SET(QT_UIC3_EXECUTABLE NOTFOUND)
+    SET(QT_RCC_EXECUTABLE NOTFOUND)
+    SET(QT_DBUSCPP2XML_EXECUTABLE NOTFOUND)
+    SET(QT_DBUSXML2CPP_EXECUTABLE NOTFOUND)
+    SET(QT_LUPDATE_EXECUTABLE NOTFOUND)
+    SET(QT_LRELEASE_EXECUTABLE NOTFOUND)
+    SET(QT_QCOLLECTIONGENERATOR_EXECUTABLE NOTFOUND)
+    SET(QT_DESIGNER_EXECUTABLE NOTFOUND)
+    SET(QT_LINGUIST_EXECUTABLE NOTFOUND)
+  ENDIF(QT_QMAKE_CHANGED)
+  
+  FIND_PROGRAM(QT_MOC_EXECUTABLE
+    NAMES moc-qt5 moc
+    PATHS ${QT_BINARY_DIR}
+    NO_DEFAULT_PATH
+    )
+
+  FIND_PROGRAM(QT_UIC_EXECUTABLE
+    NAMES uic-qt5 uic
+    PATHS ${QT_BINARY_DIR}
+    NO_DEFAULT_PATH
+    )
+
+  FIND_PROGRAM(QT_UIC3_EXECUTABLE
+    NAMES uic3
+    PATHS ${QT_BINARY_DIR}
+    NO_DEFAULT_PATH
+    )
+
+  FIND_PROGRAM(QT_RCC_EXECUTABLE 
+    NAMES rcc
+    PATHS ${QT_BINARY_DIR}
+    NO_DEFAULT_PATH
+    )
+
+  FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE 
+    NAMES qdbuscpp2xml
+    PATHS ${QT_BINARY_DIR}
+    NO_DEFAULT_PATH
+    )
+
+  FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE 
+    NAMES qdbusxml2cpp
+    PATHS ${QT_BINARY_DIR}
+    NO_DEFAULT_PATH
+    )
+
+  FIND_PROGRAM(QT_LUPDATE_EXECUTABLE
+    NAMES lupdate-qt5 lupdate
+    PATHS ${QT_BINARY_DIR}
+    NO_DEFAULT_PATH
+    )
+
+  FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
+    NAMES lrelease-qt5 lrelease
+    PATHS ${QT_BINARY_DIR}
+    NO_DEFAULT_PATH
+    )
+
+  FIND_PROGRAM(QT_QCOLLECTIONGENERATOR_EXECUTABLE
+    NAMES qcollectiongenerator-qt5 qcollectiongenerator
+    PATHS ${QT_BINARY_DIR}
+    NO_DEFAULT_PATH
+    )
+
+  FIND_PROGRAM(QT_DESIGNER_EXECUTABLE
+    NAMES designer-qt5 designer
+    PATHS ${QT_BINARY_DIR}
+    NO_DEFAULT_PATH
+    )
+
+  FIND_PROGRAM(QT_LINGUIST_EXECUTABLE
+    NAMES linguist-qt5 linguist
+    PATHS ${QT_BINARY_DIR}
+    NO_DEFAULT_PATH
+    )
+
+  IF (QT_MOC_EXECUTABLE)
+     SET(QT_WRAP_CPP "YES")
+  ENDIF (QT_MOC_EXECUTABLE)
+
+  IF (QT_UIC_EXECUTABLE)
+     SET(QT_WRAP_UI "YES")
+  ENDIF (QT_UIC_EXECUTABLE)
+
+
+
+  MARK_AS_ADVANCED( QT_UIC_EXECUTABLE QT_UIC3_EXECUTABLE QT_MOC_EXECUTABLE
+    QT_RCC_EXECUTABLE QT_DBUSXML2CPP_EXECUTABLE QT_DBUSCPP2XML_EXECUTABLE
+    QT_LUPDATE_EXECUTABLE QT_LRELEASE_EXECUTABLE QT_QCOLLECTIONGENERATOR_EXECUTABLE
+    QT_DESIGNER_EXECUTABLE QT_LINGUIST_EXECUTABLE)
+
+
 set(QT5 TRUE)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)

Linear_cell_complex/examples/Linear_cell_complex/CMakeLists.txt

@@ -12,12 +12,17 @@ endif()
 
 # If you want to visualize a linear cell complex, there are 2 viewers
 # based on qt and vtk. Just uncomment the corresponding lines
+
+
 # find_package(CGAL QUIET COMPONENTS Core Qt4)
+#OR
+ find_package(CGAL QUIET COMPONENTS Core Qt5)
+
 # include("CMakeLCCViewerQt.inc")
 # include("CMakeLCCViewerVtk.inc")
 
 # If you don't want to visualize, use the following line (otherwise comment it)
-find_package(CGAL QUIET COMPONENTS Core)
+#find_package(CGAL QUIET COMPONENTS Core)
 
 # For Gprof.
 # ADD_DEFINITIONS("-pg")

Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt

@@ -27,11 +27,7 @@ if(USE_QT5)
 	
 	find_package(Qt5)
 
-	  FIND_PROGRAM(QT_QCOLLECTIONGENERATOR_EXECUTABLE
-   		NAMES qcollectiongenerator-qt5 qcollectiongenerator
-    		PATHS ${QT_BINARY_DIR}
-    		NO_DEFAULT_PATH
-   	 )
+        set(CMAKE_AUTOMOC OFF)
 
 else (USE_QT5)
 

Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.h

@@ -7,6 +7,10 @@
 #include <QProcess>
 #include <QTextStream>
 
+#if QT_VERSION >= 0x050000
+#include <QMessageBox>
+#endif
+
 class MainWindow : public QMainWindow
 {
 

Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.cpp

@@ -65,7 +65,7 @@ void Scene::draw() {
 void Scene::load_points(const QString& fileName) {
   p3dt.clear();
   std::vector<Point> points;
-  std::ifstream ifs(fileName.toAscii().data() );
+  std::ifstream ifs(fileName.toLatin1().data() );
   std::copy(std::istream_iterator<Point>(ifs), 
   std::istream_iterator<Point>(),
   std::back_inserter(points));

Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/periodic_3_triangulation_3_demo.cpp

@@ -1,5 +1,10 @@
 #include "MainWindow.h"
+
+#if QT_VERSION >= 0x050000
+#include <QApplication>
+#else
 #include <QtGui/QApplication>
+#endif
 
 int main(int argc, char *argv[])
 {

Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt

@@ -10,36 +10,58 @@ else()
   cmake_policy(VERSION 2.6)
 endif()
 
-find_package(CGAL  COMPONENTS Qt4)
-include(${CGAL_USE_FILE})
-
 set( QT_USE_QTXML    TRUE )
 set( QT_USE_QTMAIN   TRUE )
 set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
-find_package(Qt4)
+
+#New for Qt5 version !
+option (USE_QT5 "Use Qt5 version instead of Qt4" ON)
+
+if(USE_QT5)
+
+	find_package(CGAL COMPONENTS Qt5)
+
+	include(${CGAL_USE_FILE})
+	
+	find_package(Qt5)
+
+else (USE_QT5)
+
+	find_package(CGAL COMPONENTS Qt4)
+	include(${CGAL_USE_FILE})
+
+	find_package(Qt4)
+
+	if(CGAL_FOUND AND QT4_FOUND)
+		include(${QT_USE_FILE})
+		message("Qt4 found")
+		set(QT4 TRUE)
+	endif()
+
+endif (USE_QT5)
+
+include(QtChoice)
 
 find_package(OpenGL)
 
-if(QT4_FOUND)
-  include( ${QT_USE_FILE} )
+if(QT4 OR QT5)
   find_package(QGLViewer)
-endif(QT4_FOUND)
+endif(QT4 OR QT5)
 
-if ( CGAL_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND AND QT_QCOLLECTIONGENERATOR_EXECUTABLE )
+if ( CGAL_FOUND AND (QT4 OR QT5) AND OPENGL_FOUND AND QGLVIEWER_FOUND AND QT_QCOLLECTIONGENERATOR_EXECUTABLE )
 
-  include(${QT_USE_FILE})
 
   include_directories (${QGLVIEWER_INCLUDE_DIR})
   include_directories (BEFORE ../../include ./ )
 
   # ui file, created wih Qt Designer
-  qt4_wrap_ui( uis MainWindow.ui )
+  qt_wrap_ui( uis MainWindow.ui )
 
   # qrc files (resources files, that contain icons, at least)
-  qt4_add_resources ( RESOURCE_FILES ./Periodic_Lloyd_3.qrc )
+  qt_add_resources ( RESOURCE_FILES ./Periodic_Lloyd_3.qrc )
 
-  qt4_automoc( MainWindow.cpp Viewer.cpp)
+  qt_automoc( MainWindow.cpp Viewer.cpp)
 
   if(DEFINED QT_QCOLLECTIONGENERATOR_EXECUTABLE)
   else()
@@ -55,7 +77,13 @@ if ( CGAL_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND AND QT_QCOLLE
       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   )
 
-  add_executable  ( Periodic_Lloyd_3 Periodic_Lloyd_3.qhc Periodic_Lloyd_3.cpp MainWindow.cpp Viewer.cpp ${uis}  ${RESOURCE_FILES} )
+  add_executable  ( Periodic_Lloyd_3 
+                    Periodic_Lloyd_3.qhc 
+                    Periodic_Lloyd_3.cpp 
+                    MainWindow.cpp 
+                    Viewer.cpp 
+                    ${uis}  
+                    ${RESOURCE_FILES} )
 
   add_to_cached_list( CGAL_EXECUTABLE_TARGETS Periodic_Lloyd_3 )
 
@@ -63,18 +91,22 @@ if ( CGAL_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND AND QT_QCOLLE
   target_link_libraries( Periodic_Lloyd_3 ${QT_LIBRARIES} ${QGLVIEWER_LIBRARIES} )
   target_link_libraries( Periodic_Lloyd_3 ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} )
 
-else( CGAL_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND AND QT_QCOLLECTIONGENERATOR_EXECUTABLE )
+else ( CGAL_FOUND AND (QT4 OR QT5) AND OPENGL_FOUND AND QGLVIEWER_FOUND AND QT_QCOLLECTIONGENERATOR_EXECUTABLE )
 
   set(PERIODIC_LLOYD_MISSING_DEPS "")
 
   if(NOT CGAL_FOUND)
-    set(PERIODIC_LLOYD_MISSING_DEPS "the CGAL Qt4 library, ${PERIODIC_LLOYD_MISSING_DEPS}")
+    set(PERIODIC_LLOYD_MISSING_DEPS "the CGAL Qt library, ${PERIODIC_LLOYD_MISSING_DEPS}")
   endif()      	   
 
-  if(NOT QT4_FOUND)
+  if(NOT QT4 AND NOT USE_QT5)
     set(PERIODIC_LLOYD_MISSING_DEPS "Qt4, ${PERIODIC_LLOYD_MISSING_DEPS}")
   endif()  
 
+  if(NOT QT5 AND USE_QT5)
+    set(PERIODIC_LLOYD_MISSING_DEPS "Qt5, ${PERIODIC_LLOYD_MISSING_DEPS}")
+  endif()         	   
+
   if(NOT OPENGL_FOUND)
     set(PERIODIC_LLOYD_MISSING_DEPS "OpenGL, ${PERIODIC_LLOYD_MISSING_DEPS}")
   endif()      	   
@@ -90,4 +122,4 @@ else( CGAL_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND AND QT_QCOLL
 
   message(STATUS "NOTICE: This demo requires ${PERIODIC_LLOYD_MISSING_DEPS}and will not be compiled.")
 
-endif( CGAL_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND AND QT_QCOLLECTIONGENERATOR_EXECUTABLE )
+endif ( CGAL_FOUND AND (QT4 OR QT5) AND OPENGL_FOUND AND QGLVIEWER_FOUND AND QT_QCOLLECTIONGENERATOR_EXECUTABLE )

Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/MainWindow.cpp

@@ -88,8 +88,14 @@ void
 MainWindow::newPointSet()
 {
   bool ok;
+
+  #if QT_VERSION >= 0x050000
+  int numberOfPoints = QInputDialog::getInt(this,
+      "Periodic Lloyd", "Number of points: ", 100, 0, 2147483647, 1, &ok );
+  #else
   int numberOfPoints = QInputDialog::getInteger(this,
       "Periodic Lloyd", "Number of points: ", 100, 0, 2147483647, 1, &ok );
+  #endif
   
   if (ok) newPoints(numberOfPoints);
 }
@@ -102,7 +108,7 @@ MainWindow::loadPoints()
 	".", tr("All files (*)"));
   if(fileName.isEmpty()) return;
   
-  std::ifstream ifs(fileName.toAscii().data() );
+  std::ifstream ifs(fileName.toLatin1().data() );
   scene.points.clear();
   Iso_cuboid_3 dom;
   ifs >> dom;
@@ -140,7 +146,7 @@ MainWindow::savePoints()
 	".", tr("*.pts"));
   if(fileName.isEmpty()) return;
   
-  std::ofstream ofs(fileName.toAscii().data() );
+  std::ofstream ofs(fileName.toLatin1().data() );
   ofs << scene.periodic_triangulation.domain() << '\n';
   for (std::list<Point_3>::iterator pit = scene.points.begin() ;
        pit != scene.points.end() ; ++pit) ofs << *pit << '\n';

Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/MainWindow.h

@@ -7,6 +7,7 @@
 #include <QInputDialog>
 #include <QSlider>
 #include <QTimer>
+#include <QMessageBox>
 
 #include <QtGui>
 #include <QProcess>

Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Periodic_Lloyd_3.cpp

@@ -10,9 +10,9 @@ int main(int argc, char** argv)
   application.setOrganizationName("INRIA");
   application.setApplicationName("3D Periodic Lloyd");
 
-  // Import resources from libCGALQt4.
+  // Import resources from libCGAL (Qt4 or QT5).
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  CGAL_QT4_INIT_RESOURCES;
+  CGAL_QT_INIT_RESOURCES;//New for Qt5 version !
   Q_INIT_RESOURCE(Periodic_Lloyd_3);
 
   MainWindow mw;

Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt

@@ -70,8 +70,10 @@ find_package(LAPACK)
 find_package(Eigen3 3.1.0)
 
 # Find Glew (optional), for splatting
+if(QT4)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/GlSplat/cmake)
 find_package(GLEW)
+endif()
 
 if((QT4 OR QT5) AND OPENGL_FOUND AND QGLVIEWER_FOUND)
 
@@ -201,7 +203,7 @@ if((QT4 OR QT5) AND OPENGL_FOUND AND QGLVIEWER_FOUND)
     add_library(gl_splat SHARED
       GlSplat/GlSplat.cpp GlSplat/Shader.cpp ${gl_splat_rc})
     target_link_libraries(gl_splat ${QT_LIBRARIES} ${GLEW_LIBRARIES})
-  endif(GLEW_FOUND)
+  endif()
 
   target_link_libraries(point_set PS_demo_scene_item)
 
@@ -211,7 +213,7 @@ if((QT4 OR QT5) AND OPENGL_FOUND AND QGLVIEWER_FOUND)
 
   if(GLEW_FOUND)
     target_link_libraries( point_set gl_splat ${GLEW_LIBRARIES} )
-  endif(GLEW_FOUND)
+  endif()
 
   add_definitions(-DQT_STATICPLUGIN)
 
@@ -263,7 +265,7 @@ endif(QT5)
 
   if(GLEW_FOUND)
     target_link_libraries( Point_set_demo gl_splat ${GLEW_LIBRARIES} )
-  endif(GLEW_FOUND)
+  endif()
 
   add_to_cached_list( CGAL_EXECUTABLE_TARGETS Point_set_demo )
 

Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/CMakeLists.txt

@@ -37,7 +37,7 @@ include(QtChoice)
 
 find_package(GLEW REQUIRED)
 
-include_directories( ${QT_QTOPENGL_INCLUDE_DIR} ${QT_QTXML_INCLUDE_DIR} ${GLEW_INCLUDE_DIR})
+include_directories( ${QT_LIBRARIES} ${GLEW_INCLUDE_DIR})
 
 set(srcs Shader.cpp GlSplat.cpp)
 
@@ -45,13 +45,13 @@ qt_automoc( ${srcs})
 qt_add_resources(srcs glsplat.qrc)
 
 add_library(GlSplat SHARED ${srcs})
-target_link_libraries(GlSplat ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${GLEW_LIBRARIES})
+target_link_libraries(GlSplat ${QT_LIBRARIES} ${GLEW_LIBRARIES})
 
 find_package(QGLViewer)
 if(QGLVIEWER_FOUND)
   include_directories( ${QGLViewer_INCLUDES})
   add_executable(demo demo.cpp)
-  target_link_libraries(demo ${QT_QTXML_LIBRARY} ${QGLViewer_LIBRARIES} GlSplat)
+  target_link_libraries(demo ${QT_LIBRARIES} ${QGLViewer_LIBRARIES} GlSplat)
 else()
   message("QGLViewer not found, demo won't be built")
 endif()

Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/GlSplat.cpp

@@ -19,6 +19,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include <iostream>
+
 #include <GL/glew.h>
 
 #include "GlSplat.h"

Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/Shader.h

@@ -18,6 +18,8 @@
 #define _GLSPLAT_Shader_h_
 
 #include <GL/glew.h>
+#define QT_NO_OPENGL_ES_2
+
 #include <CGAL/glu.h>
 
 #ifndef NDEBUG