From 4463e53d0a84ee80cf0feb20ffc86ae249937a44 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 19 Aug 2015 15:57:29 +0200 Subject: [PATCH] Revert "add a dependency on the Qt5::QSQLiteDriverPlugin" This reverts commit 156b267d85dd2f8a5d92c944716138a501c7cb44. Conflicts: Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt The reason is that our demo does not depend on QtSql or any QtSql plugin. For details, see: https://github.com/CGAL/cgal/issues/254#issuecomment-132605984 --- .../demo/Periodic_3_triangulation_3/CMakeLists.txt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) 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 index a0d4b6416ad..1da698a23fd 100644 --- a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt +++ b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt @@ -14,7 +14,7 @@ find_package(CGAL COMPONENTS Qt5) include( ${CGAL_USE_FILE} ) # Find Qt5 itself -find_package(Qt5 QUIET COMPONENTS Xml OpenGL Help Core Sql) +find_package(Qt5 QUIET COMPONENTS Xml OpenGL Help Core) # Find OpenGL find_package(OpenGL) @@ -25,7 +25,7 @@ if(Qt5_FOUND) find_package(QGLViewer) endif(Qt5_FOUND) -if (CGAL_FOUND AND CGAL_Qt5_FOUND AND OPENGL_FOUND AND Qt5_FOUND AND QGLVIEWER_FOUND AND TARGET Qt5::qcollectiongenerator AND TARGET Qt5::QSQLiteDriverPlugin) +if (CGAL_FOUND AND CGAL_Qt5_FOUND AND OPENGL_FOUND AND Qt5_FOUND AND QGLVIEWER_FOUND AND TARGET Qt5::qcollectiongenerator) include_directories( ${QGLVIEWER_INCLUDE_DIR} ) @@ -97,10 +97,6 @@ else () set(PERIODIC_TRIANGULATION_MISSING_DEPS "qcollectiongenerator, ${PERIODIC_TRIANGULATION_MISSING_DEPS}") endif() - if (NOT TARGET Qt5::QSQLiteDriverPlugin) - set(PERIODIC_TRIANGULATION_MISSING_DEPS "SQLite driver plugin, ${PERIODIC_TRIANGULATION_MISSING_DEPS}") - endif() - message(STATUS "NOTICE: This demo requires ${PERIODIC_TRIANGULATION_MISSING_DEPS}and will not be compiled.") endif ()