songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "add a dependency on the Qt5::QSQLiteDriverPlugin" 

This reverts commit 156b267d85.

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
This commit is contained in:
Laurent Rineau 2015-08-19 15:57:29 +02:00
parent 8c9b4975bc
commit 4463e53d0a
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
View File

@ -14,7 +14,7 @@ find_package(CGAL COMPONENTS Qt5)
include( ${CGAL_USE_FILE} ) include( ${CGAL_USE_FILE} )
# Find Qt5 itself # 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 OpenGL
find_package(OpenGL) find_package(OpenGL)
@ -25,7 +25,7 @@ if(Qt5_FOUND)
find_package(QGLViewer) find_package(QGLViewer)
endif(Qt5_FOUND) 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} ) include_directories( ${QGLVIEWER_INCLUDE_DIR} )
@ -97,10 +97,6 @@ else ()
set(PERIODIC_TRIANGULATION_MISSING_DEPS "qcollectiongenerator, ${PERIODIC_TRIANGULATION_MISSING_DEPS}") set(PERIODIC_TRIANGULATION_MISSING_DEPS "qcollectiongenerator, ${PERIODIC_TRIANGULATION_MISSING_DEPS}")
endif() 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.") message(STATUS "NOTICE: This demo requires ${PERIODIC_TRIANGULATION_MISSING_DEPS}and will not be compiled.")
endif () endif ()