diff --git a/Installation/cmake/modules/FindQt5.cmake b/Installation/cmake/modules/FindQt5.cmake index 0b75d61267f..42be6e3d033 100644 --- a/Installation/cmake/modules/FindQt5.cmake +++ b/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) diff --git a/Linear_cell_complex/examples/Linear_cell_complex/CMakeLists.txt b/Linear_cell_complex/examples/Linear_cell_complex/CMakeLists.txt index 77cb4be0b18..7e798f8853d 100644 --- a/Linear_cell_complex/examples/Linear_cell_complex/CMakeLists.txt +++ b/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") diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt old mode 100644 new mode 100755 index dcd7073307d..f74756dad45 --- a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt +++ b/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) diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.h b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.h old mode 100644 new mode 100755 index 6a72928e899..061853c77c6 --- a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.h +++ b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.h @@ -7,6 +7,10 @@ #include #include +#if QT_VERSION >= 0x050000 +#include +#endif + class MainWindow : public QMainWindow { diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.ui b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.ui old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Periodic_3_triangulation_3.qhcp b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Periodic_3_triangulation_3.qhcp old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Periodic_3_triangulation_3.qhp b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Periodic_3_triangulation_3.qhp old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Periodic_3_triangulation_3.qrc b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Periodic_3_triangulation_3.qrc old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.cpp b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.cpp old mode 100644 new mode 100755 index 2a3c12692ee..a9a35e64c59 --- a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.cpp +++ b/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 points; - std::ifstream ifs(fileName.toAscii().data() ); + std::ifstream ifs(fileName.toLatin1().data() ); std::copy(std::istream_iterator(ifs), std::istream_iterator(), std::back_inserter(points)); diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.h b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.h old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene_utils.h b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene_utils.h old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/data/oneH.xyz b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/data/oneH.xyz old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/data/oneK.xyz b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/data/oneK.xyz old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/data/points b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/data/points old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/documentation/images/mainwindow.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/documentation/images/mainwindow.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/documentation/index.html b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/documentation/index.html old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/documentation/introduction.html b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/documentation/introduction.html old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/documentation/menu.html b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/documentation/menu.html old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/ball.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/ball.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/camera.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/camera.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/clipping.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/clipping.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/clippingOff.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/clippingOff.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/conflict.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/conflict.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/cover1.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/cover1.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/cover27.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/cover27.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/fileOpen.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/fileOpen.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/init0.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/init0.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/init1.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/init1.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/initGrid.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/initGrid.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/initRand.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/initRand.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/initRandPlanar.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/initRandPlanar.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/inputPointBall.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/inputPointBall.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/inputPointRandom.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/inputPointRandom.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/license.txt b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/license.txt old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/locate.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/locate.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/multiple.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/multiple.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/multipleOff.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/multipleOff.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/pause.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/pause.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/planar.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/planar.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/play.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/play.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/twoColorClipping.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/twoColorClipping.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/wireframe.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/wireframe.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/wireframeOff.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/wireframeOff.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/periodic_3_triangulation_3_demo.cpp b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/periodic_3_triangulation_3_demo.cpp old mode 100644 new mode 100755 index 673141e864a..af16cc0ee86 --- a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/periodic_3_triangulation_3_demo.cpp +++ b/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 +#else #include +#endif int main(int argc, char *argv[]) { diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/resources/about.html b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/resources/about.html old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/resources/about_CGAL.html b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/resources/about_CGAL.html old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt old mode 100644 new mode 100755 index 25d87153cb2..3a83a96b8ab --- a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt +++ b/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,17 +91,21 @@ 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() + 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}") @@ -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 ) diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/MainWindow.cpp b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/MainWindow.cpp old mode 100644 new mode 100755 index 5ff00413d71..9ab363badf3 --- a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/MainWindow.cpp +++ b/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::iterator pit = scene.points.begin() ; pit != scene.points.end() ; ++pit) ofs << *pit << '\n'; diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/MainWindow.h b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/MainWindow.h old mode 100644 new mode 100755 index d39cea89a87..18b8bd1814a --- a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/MainWindow.h +++ b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/MainWindow.h @@ -7,6 +7,7 @@ #include #include #include +#include #include #include diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/MainWindow.ui b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/MainWindow.ui old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Periodic_Lloyd_3.cpp b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Periodic_Lloyd_3.cpp old mode 100644 new mode 100755 index 3bd16d35fa9..fba25564ba6 --- a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Periodic_Lloyd_3.cpp +++ b/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; diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Periodic_Lloyd_3.qhcp b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Periodic_Lloyd_3.qhcp old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Periodic_Lloyd_3.qhp b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Periodic_Lloyd_3.qhp old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Periodic_Lloyd_3.qrc b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Periodic_Lloyd_3.qrc old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Scene.h b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Scene.h old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Viewer.cpp b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Viewer.cpp old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Viewer.h b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Viewer.h old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/about_CGAL.html b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/about_CGAL.html old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/about_Periodic_Lloyd_3.html b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/about_Periodic_Lloyd_3.html old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/documentation/images/mainwindow.png b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/documentation/images/mainwindow.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/documentation/index.html b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/documentation/index.html old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/documentation/introduction.html b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/documentation/introduction.html old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/documentation/menu.html b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/documentation/menu.html old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/icons/cp8.png b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/icons/cp8.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/icons/fileNew.png b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/icons/fileNew.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/icons/fileOpen.png b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/icons/fileOpen.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/icons/fileSave.png b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/icons/fileSave.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/icons/pause.png b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/icons/pause.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/icons/planar.png b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/icons/planar.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/icons/play.png b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/icons/play.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/icons/step.png b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/icons/step.png old mode 100644 new mode 100755 diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/typedefs.h b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/typedefs.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt old mode 100644 new mode 100755 index 3f734e7d866..074f4509266 --- a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt +++ b/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 ) diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/CMakeLists.txt b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/CMakeLists.txt old mode 100644 new mode 100755 index c4a9c94459c..0e9868ea9a1 --- a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/CMakeLists.txt +++ b/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() diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/GlSplat.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/GlSplat.cpp old mode 100644 new mode 100755 index 81ed61d797e..7991f6ca400 --- a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/GlSplat.cpp +++ b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/GlSplat.cpp @@ -19,6 +19,7 @@ #include #include #include + #include #include "GlSplat.h" diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/GlSplat.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/GlSplat.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/GlSplat_config.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/GlSplat_config.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/Shader.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/Shader.cpp old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/Shader.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/Shader.h old mode 100644 new mode 100755 index 669d23727db..613bdfe797c --- a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/Shader.h +++ b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/Shader.h @@ -18,6 +18,8 @@ #define _GLSPLAT_Shader_h_ #include +#define QT_NO_OPENGL_ES_2 + #include #ifndef NDEBUG diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/cmake/FindGLEW.cmake b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/cmake/FindGLEW.cmake old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/cmake/FindQGLViewer.cmake b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/cmake/FindQGLViewer.cmake old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/demo.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/demo.cpp old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/glsplat.qrc b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/glsplat.qrc old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/shaders/Finalization.glsl b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/shaders/Finalization.glsl old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/shaders/Raycasting.glsl b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/GlSplat/shaders/Raycasting.glsl old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Kernel_type.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Kernel_type.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/MainWindow.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/MainWindow.cpp old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/MainWindow.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/MainWindow.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/MainWindow.ui b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/MainWindow.ui old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Messages_interface.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Messages_interface.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_average_spacing_plugin.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_average_spacing_plugin.cpp old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_cleaning_plugin.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_cleaning_plugin.cpp old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_cleaning_plugin.ui b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_cleaning_plugin.ui old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_inside_out_plugin.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_inside_out_plugin.cpp old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_local_spacing_plugin.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_local_spacing_plugin.cpp old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_normal_estimation_plugin.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_normal_estimation_plugin.cpp old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_normal_estimation_plugin.ui b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_normal_estimation_plugin.ui old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_off_plugin.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_off_plugin.cpp old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin.cpp old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin.ui b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin.ui old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin_cgal_code.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin_cgal_code.cpp old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_simplification_plugin.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_simplification_plugin.cpp old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_simplification_plugin.ui b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_simplification_plugin.ui old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_smoothing_plugin.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_smoothing_plugin.cpp old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_xyz_plugin.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_xyz_plugin.cpp old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.cpp old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.qrc b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.qrc old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_scene_item.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_scene_item.cpp old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_scene_item.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_scene_item.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_scene_item_config.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_scene_item_config.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_io_plugin_interface.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_io_plugin_interface.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_plugin_helper.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_plugin_helper.cpp old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_plugin_helper.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_plugin_helper.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_plugin_interface.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_plugin_interface.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_type.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_type.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_type_fwd.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_type_fwd.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene.cpp old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_basic_objects_config.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_basic_objects_config.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_draw_interface.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_draw_interface.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_interface.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_interface.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_item.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_item.cpp old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_item.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_item.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_item_config.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_item_config.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_item_with_display_list.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_item_with_display_list.cpp old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_item_with_display_list.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_item_with_display_list.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_plane_item.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_plane_item.cpp old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_plane_item.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_plane_item.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_polyhedron_item.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_polyhedron_item.cpp old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_polyhedron_item.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_polyhedron_item.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_polyhedron_item_config.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_polyhedron_item_config.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Viewer.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Viewer.cpp old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Viewer.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Viewer.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/cgal_test_with_cmake.bat b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/cgal_test_with_cmake.bat old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/config.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/config.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/data/ChineseDragon-points.off b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/data/ChineseDragon-points.off old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/include/CGAL/Make_bar.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/include/CGAL/Make_bar.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/include/CGAL/compute_normal.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/include/CGAL/compute_normal.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/include/CGAL/gl_render.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/include/CGAL/gl_render.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/include/Point_set_3.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/include/Point_set_3.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/include/UI_point_3.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/include/UI_point_3.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/marching_cubes.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/marching_cubes.h old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/resources/about.html b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/resources/about.html old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/resources/cgal_logo.xpm b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/resources/cgal_logo.xpm old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/resources/check-off.png b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/resources/check-off.png old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/resources/check-off.svg b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/resources/check-off.svg old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/resources/check-on.png b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/resources/check-on.png old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/resources/check.svg b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/resources/check.svg old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/resources/editcopy.png b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/resources/editcopy.png old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/resources/minus.png b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/resources/minus.png old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/resources/plus.png b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/resources/plus.png old mode 100644 new mode 100755 diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/resources/simplification.png b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/resources/simplification.png old mode 100644 new mode 100755