diff --git a/GraphicsView/demo/Alpha_shapes_3/CMakeLists.txt b/GraphicsView/demo/Alpha_shapes_3/CMakeLists.txt index a7f72c06668..d22add79956 100644 --- a/GraphicsView/demo/Alpha_shapes_3/CMakeLists.txt +++ b/GraphicsView/demo/Alpha_shapes_3/CMakeLists.txt @@ -23,7 +23,7 @@ find_package(Qt4) find_package(OpenGL) find_package(QGLViewer) -if ( CGAL_FOUND AND QT_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND ) +if ( CGAL_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND ) include(${QT_USE_FILE}) diff --git a/Polyhedron/demo/Polyhedron/CMakeLists.txt b/Polyhedron/demo/Polyhedron/CMakeLists.txt index 2d429abbcba..21c8f79d7f8 100644 --- a/Polyhedron/demo/Polyhedron/CMakeLists.txt +++ b/Polyhedron/demo/Polyhedron/CMakeLists.txt @@ -38,15 +38,15 @@ find_package(Qt4) find_package(OpenGL) # Find QGLViewer -if(QT_FOUND) +if(QT4_FOUND) include(${QT_USE_FILE}) find_package(QGLViewer ) -endif(QT_FOUND) +endif(QT4_FOUND) # Find TAUCS (optionnal) find_package(TAUCS) -if(CGAL_Qt4_FOUND AND QT_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) +if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) include_directories ( ${QGLVIEWER_INCLUDE_DIR} ) @@ -122,7 +122,7 @@ if(CGAL_Qt4_FOUND AND QT_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) target_link_libraries(Polyhedron_3 ${TAUCS_LIBRARIES}) endif(TAUCS_FOUND) -else (CGAL_Qt4_FOUND AND QT_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) +else (CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) set(POLYHEDRON_MISSING_DEPS "") @@ -130,7 +130,7 @@ else (CGAL_Qt4_FOUND AND QT_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) set(POLYHEDRON_MISSING_DEPS "the CGAL Qt4 library, ${POLYHEDRON_MISSING_DEPS}") endif() - if(NOT QT_FOUND) + if(NOT QT4_FOUND) set(POLYHEDRON_MISSING_DEPS "Qt4, ${POLYHEDRON_MISSING_DEPS}") endif() @@ -144,4 +144,4 @@ else (CGAL_Qt4_FOUND AND QT_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) message(STATUS "NOTICE: This demo requires ${POLYHEDRON_MISSING_DEPS}and will not be compiled.") -endif (CGAL_Qt4_FOUND AND QT_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) +endif (CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)