diff --git a/Documentation/doc/Documentation/Installation.txt b/Documentation/doc/Documentation/Installation.txt
index ac67f2cac42..1f36cd56288 100644
--- a/Documentation/doc/Documentation/Installation.txt
+++ b/Documentation/doc/Documentation/Installation.txt
@@ -551,14 +551,6 @@ and the \ref PkgRidges_3 packages.
The \sc{Eigen} web site is `http://eigen.tuxfamily.org`.
-\subsection thirdpartylibQGLViewer libQGLViewer
-
-libQGLViewer is a 3D widget based on \sc{Qt} 4's `QGLWidget`. In case of \sc{Qt}5 used, libQGLViewer needs to be recompiled with the proper \sc{Qt}5 version.
-
-In \cgal some 3D demos are based on libQGLViewer.
-
-It can be downloaded from `http://www.libqglviewer.com/`.
-
\subsection thirdpartyESBTL ESBTL
The \sc{Esbtl} (Easy Structural Biology Template Library) is a library that allows
@@ -1172,22 +1164,6 @@ Only the directory containing the header files of \sc{Eigen} 3.1 (or grea
| `EIGEN3_INCLUDE_DIR` | Directory containing the file `signature_of_eigen3_matrix_library` | CMake |
| `EIGEN3_INC_DIR` | Idem | Environment |
-\subsection installation_qgl QGLViewer Library
-
-Some demos require the GLViewer library.
-
-In most cases, if QGLViewer is not automatically found, setting the `QGLVIEWERROOT`
-environment variable is sufficient. If it is not, you can specify the directory containing
-the header files and the full pathnames of the release and debug libraries
-
-| Variable | Description | Type |
-| :- | :- | :- |
-| `QGLVIEWERROOT` | Root directory of the QGLViewer library | Environment |
-| `QGLVIEWER_INCLUDE_DIR` | Directory containing the `QGLViewer/qglviewer.h` file | CMake |
-| `QGLVIEWER_LIBRARY_RELEASE` | Full pathname to a release build of the QGLViewer library | CMake |
-| `QGLVIEWER_LIBRARY_DEBUG` | Full pathname to a debug build of the QGLViewer library | CMake |
-
-
\subsection installation_esbtl ESBTL Library
One skin surface example requires the \sc{Esbtl} library in order to read \sc{Pdb} files.
diff --git a/Installation/CHANGES.md b/Installation/CHANGES.md
index 0fcef24d83d..73a1ead44c3 100644
--- a/Installation/CHANGES.md
+++ b/Installation/CHANGES.md
@@ -7,6 +7,12 @@ Release 4.13
Release date: September 2018
+### Installation
+
+- The library CGAL_Qt5 now contains a fork of the version 2.7.0 of libQGLViewer.
+ The corresponding code is in the package GraphicsView.
+ The dependency for the external library libQGLViewer is therefore dropped for all demos.
+
### 2D and 3D Linear Geometry Kernel
- An operator() that takes a Ray_3 has been added to the concept
ConstructProjectedPoint 3.
diff --git a/Installation/INSTALL.md b/Installation/INSTALL.md
index 043e7643757..17abb7c05ab 100644
--- a/Installation/INSTALL.md
+++ b/Installation/INSTALL.md
@@ -63,9 +63,6 @@ CGAL packages, some are only needed for demos.
- Qt5 (>= 5.3)
http://qt-project.org/
- - libQGLViewer
- http://www.libqglviewer.com/
-
- Geomview
http://www.geomview.org/
Not supported with Visual C++
diff --git a/Installation/cmake/modules/FindQGLViewer.cmake b/Installation/cmake/modules/FindQGLViewer.cmake
deleted file mode 100644
index aadfa505689..00000000000
--- a/Installation/cmake/modules/FindQGLViewer.cmake
+++ /dev/null
@@ -1,81 +0,0 @@
-# - Try to find QGLViewer
-# Once done this will define
-#
-# QGLVIEWER_FOUND - system has QGLViewer
-# QGLVIEWER_INCLUDE_DIR - the QGLViewer include directory
-# QGLVIEWER_LIBRARIES - Link these to use QGLViewer
-# QGLVIEWER_DEFINITIONS - Compiler switches required for using QGLViewer
-#
-if(POLICY CMP0072)
- # About the use of OpenGL
- cmake_policy(SET CMP0072 NEW)
-endif()
-find_package(OpenGL QUIET)
-find_package(Qt5 QUIET COMPONENTS OpenGL Xml)
-
-# first look in user defined locations
-find_path(QGLVIEWER_INCLUDE_DIR
- NAMES QGLViewer/qglviewer.h
- NO_DEFAULT_PATH
- PATHS ENV QGLVIEWERROOT
- /usr/local/include
- )
-
-find_library(QGLVIEWER_LIBRARY_RELEASE
- NAMES qglviewer-qt5 qglviewer QGLViewer-qt5 QGLViewer QGLViewer2-qt5 QGLViewer2
- NO_DEFAULT_PATH
- PATHS ENV QGLVIEWERROOT
- ENV LD_LIBRARY_PATH
- ENV LIBRARY_PATH
- /usr/local/lib
- PATH_SUFFIXES QGLViewer QGLViewer/release
- )
-
-find_library(QGLVIEWER_LIBRARY_DEBUG
- NAMES dqglviewer dQGLViewer-qt5 dQGLViewer dQGLViewer2-qt5 dQGLViewer2 QGLViewerd2-qt5 QGLViewerd2
- NO_DEFAULT_PATH
- PATHS /usr/local/lib
- ENV QGLVIEWERROOT
- ENV LD_LIBRARY_PATH
- ENV LIBRARY_PATH
- PATH_SUFFIXES QGLViewer QGLViewer/debug
- )
-
-#now try the standard paths
-if (NOT QGLVIEWER_INCLUDE_DIR OR NOT QGLVIEWER_LIBRARY_RELEASE OR NOT QGLVIEWER_LIBRARY_DEBUG)
-find_path(QGLVIEWER_INCLUDE_DIR
- NAMES QGLViewer/qglviewer.h)
-
-find_library(QGLVIEWER_LIBRARY_RELEASE
- NAMES qglviewer-qt5 qglviewer QGLViewer-qt5 QGLViewer QGLViewer2-qt5 QGLViewer2)
-
-find_library(QGLVIEWER_LIBRARY_DEBUG
- NAMES dqglviewer dQGLViewer-qt5 dQGLViewer dQGLViewer2-qt5 dQGLViewer2 QGLViewerd2-qt5 QGLViewerd2)
-
-endif()
-
-if(QGLVIEWER_LIBRARY_RELEASE)
- if(QGLVIEWER_LIBRARY_DEBUG)
- set(QGLVIEWER_LIBRARIES_ Qt5::Xml Qt5::OpenGL ${OPENGL_LIBRARIES} optimized ${QGLVIEWER_LIBRARY_RELEASE} debug ${QGLVIEWER_LIBRARY_DEBUG})
- else()
- set(QGLVIEWER_LIBRARIES_ Qt5::Xml Qt5::OpenGL ${OPENGL_LIBRARIES} ${QGLVIEWER_LIBRARY_RELEASE})
- endif()
-
- set(QGLVIEWER_LIBRARIES ${QGLVIEWER_LIBRARIES_} CACHE FILEPATH "The QGLViewer library")
-
-endif()
-
-IF(QGLVIEWER_INCLUDE_DIR AND QGLVIEWER_LIBRARIES)
- SET(QGLVIEWER_FOUND TRUE)
-ENDIF(QGLVIEWER_INCLUDE_DIR AND QGLVIEWER_LIBRARIES)
-
-IF(QGLVIEWER_FOUND)
- IF(NOT QGLViewer_FIND_QUIETLY)
- MESSAGE(STATUS "Found QGLViewer: ${QGLVIEWER_LIBRARIES}")
- ENDIF(NOT QGLViewer_FIND_QUIETLY)
-ELSE(QGLVIEWER_FOUND)
- IF(QGLViewer_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find QGLViewer")
- ENDIF(QGLViewer_FIND_REQUIRED)
-ENDIF(QGLVIEWER_FOUND)
-
diff --git a/Linear_cell_complex/benchmark/Linear_cell_complex_2/CMakeLists.txt b/Linear_cell_complex/benchmark/Linear_cell_complex_2/CMakeLists.txt
index 3baf4250adc..6eae9b0b136 100644
--- a/Linear_cell_complex/benchmark/Linear_cell_complex_2/CMakeLists.txt
+++ b/Linear_cell_complex/benchmark/Linear_cell_complex_2/CMakeLists.txt
@@ -48,11 +48,11 @@ SET(QT_USE_QTSVG TRUE)
SET(QT_USE_QTXML TRUE )
INCLUDE(${QT_USE_FILE})
ADD_DEFINITIONS(${QT_DEFINITIONS})
-SET (CGoGN_EXT_INCLUDES ${CGoGN_EXT_INCLUDES} ${QT_INCLUDE_DIR} ${QGLVIEWER_INCLUDE_DIR} )
-SET (CGoGN_EXT_LIBS ${CGoGN_EXT_LIBS} ${QT_LIBRARIES} ${QGLVIEWER_LIBRARIES} )
+SET (CGoGN_EXT_INCLUDES ${CGoGN_EXT_INCLUDES} ${QT_INCLUDE_DIR} )
+SET (CGoGN_EXT_LIBS ${CGoGN_EXT_LIBS} ${QT_LIBRARIES} )
add_executable(cgogn_performance_2 performance_2.h cgogn_performance_2.h cgogn_performance_2.cpp)
-target_link_libraries(cgogn_performance_2 algo assimp container nl topology utils Zinri z ${QT_LIBRARIES} ${QGLVIEWER_LIBRARIES} )
+target_link_libraries(cgogn_performance_2 algo assimp container nl topology utils Zinri z ${QT_LIBRARIES} )
# Performance_2
add_executable(performance_2
@@ -68,6 +68,6 @@ add_executable(performance_2
target_link_libraries(performance_2
${CGAL_LIBRARIES}
surface_mesh
- algo assimp container nl topology utils Zinri z ${QT_LIBRARIES} ${QGLVIEWER_LIBRARIES}
+ algo assimp container nl topology utils Zinri z ${QT_LIBRARIES}
${OPENMESH_LIBRARIES}
)
diff --git a/Linear_cell_complex/benchmark/Linear_cell_complex_3/CMakeLists.txt b/Linear_cell_complex/benchmark/Linear_cell_complex_3/CMakeLists.txt
index e1a2e344722..9faf17e58ac 100644
--- a/Linear_cell_complex/benchmark/Linear_cell_complex_3/CMakeLists.txt
+++ b/Linear_cell_complex/benchmark/Linear_cell_complex_3/CMakeLists.txt
@@ -37,11 +37,11 @@ add_definitions(-DINCLUDE_TEMPLATES)
# Performance_3
add_executable(performance_3 performance_3.cpp)
add_dependencies(performance_3 OpenVolumeMesh)
-target_link_libraries(performance_3 OpenVolumeMesh boost_timer boost_system ${CGAL_LIBRARIES} algo assimp container nl topology utils Zinri z xml2 ${QT_LIBRARIES} ${QGLVIEWER_LIBRARIES} ${MAP_VIEWER_LIBRARIES})
+target_link_libraries(performance_3 OpenVolumeMesh boost_timer boost_system ${CGAL_LIBRARIES} algo assimp container nl topology utils Zinri z xml2 ${QT_LIBRARIES} ${MAP_VIEWER_LIBRARIES})
# CGoGN
add_executable(cgogn_performance_3 performance_3.h cgogn_performance_3.h cgogn_performance_3.cpp)
-target_link_libraries(cgogn_performance_3 algo assimp container nl topology utils Zinri z xml2 ${QT_LIBRARIES} ${QGLVIEWER_LIBRARIES} )
+target_link_libraries(cgogn_performance_3 algo assimp container nl topology utils Zinri z xml2 ${QT_LIBRARIES} )
# LCC_3
add_executable(lcc_performance_3 performance_3.h lcc_performance_3.h lcc_performance_3.cpp)