replace macro CGAL_USE_BASIC_VIEWER by CGAL_USE_BASIC_VIEWER_QT

Author: gdamiand

Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Arrangement_on_surface_2.txt

@@ -6859,8 +6859,8 @@ An arrangement data structure can be visualized by calling the \link PkgArrangem
 
 \cgalExample{Arrangement_on_surface_2/draw_arr.cpp}
 
-This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` is defined.
-Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
+This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER_QT` is defined.
+Linking with the cmake target `CGAL::CGAL_Basic_viewer_Qt` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER_QT`.
 
 \cgalFigureBegin{aos_fig-draw_arr,draw_arr.png}
 A snapshot of the window created by the program

Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/draw_arrangement_2.h

@@ -29,8 +29,8 @@ namespace CGAL {
  * `CGAL::Arrangement_2` class template. Parameters of the drawing are taken
  * from the optional graphics scene options parameter.
  *
-A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER`/`CGAL_USE_BASIC_VIEWER_QT` (Qt viewer) is defined.
-Linking with the cmake target `CGAL::CGAL_Basic_viewer`/`CGAL::CGAL_Basic_viewer_Qt` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`/`CGAL_USE_BASIC_VIEWER_QT`.
+A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER_QT` (Qt viewer) is defined.
+Linking with the cmake target `CGAL::CGAL_Basic_viewer_Qt` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER_QT`.
  *
  * \tparam GeometryTraits_2 a geometry traits type, a model of a 2D arrangement
  * traits concept. At this point it must be an instance of either

Arrangement_on_surface_2/examples/Arrangement_on_surface_2/CMakeLists.txt

@@ -16,15 +16,15 @@ foreach(cppfile ${cppfiles})
 endforeach()
 
 if(CGAL_Qt6_FOUND)
-  target_link_libraries(draw_arr PRIVATE CGAL::CGAL_Basic_viewer)
-  target_link_libraries(linear_conics PRIVATE CGAL::CGAL_Basic_viewer)
-  target_link_libraries(parabolas PRIVATE CGAL::CGAL_Basic_viewer)
-  target_link_libraries(ellipses PRIVATE CGAL::CGAL_Basic_viewer)
-  target_link_libraries(hyperbolas PRIVATE CGAL::CGAL_Basic_viewer)
-  target_link_libraries(polylines PRIVATE CGAL::CGAL_Basic_viewer)
-  target_link_libraries(circles PRIVATE CGAL::CGAL_Basic_viewer)
-  target_link_libraries(circular_arcs PRIVATE CGAL::CGAL_Basic_viewer)
-  target_link_libraries(spherical_insert PRIVATE CGAL::CGAL_Basic_viewer)
+  target_link_libraries(draw_arr PRIVATE CGAL::CGAL_Basic_viewer_Qt)
+  target_link_libraries(linear_conics PRIVATE CGAL::CGAL_Basic_viewer_Qt)
+  target_link_libraries(parabolas PRIVATE CGAL::CGAL_Basic_viewer_Qt)
+  target_link_libraries(ellipses PRIVATE CGAL::CGAL_Basic_viewer_Qt)
+  target_link_libraries(hyperbolas PRIVATE CGAL::CGAL_Basic_viewer_Qt)
+  target_link_libraries(polylines PRIVATE CGAL::CGAL_Basic_viewer_Qt)
+  target_link_libraries(circles PRIVATE CGAL::CGAL_Basic_viewer_Qt)
+  target_link_libraries(circular_arcs PRIVATE CGAL::CGAL_Basic_viewer_Qt)
+  target_link_libraries(spherical_insert PRIVATE CGAL::CGAL_Basic_viewer_Qt)
 else()
   message(
     STATUS

Basic_viewer/doc/Basic_viewer/CGAL/Qt/Basic_viewer.h

@@ -5,7 +5,7 @@ namespace CGAL {
 /*!
  \ingroup PkgBasicViewerClasses
 
-The class `Basic_viewer` is a Qt widget based on `QGLViewer` that allows to visualize 3D elements: points, segments, triangles, rays and lines. This class stores a reference to a `Graphics_scene`. Elements are added through the scene. This class requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER_QT` is defined. Linking with the cmake target `CGAL::CGAL_Basic_viewer` or `CGAL::CGAL_Basic_viewer_Qt` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER` & `CGAL_USE_BASIC_VIEWER_QT`.
+The class `Basic_viewer` is a Qt widget based on `QGLViewer` that allows to visualize 3D elements: points, segments, triangles, rays and lines. This class stores a reference to a `Graphics_scene`. Elements are added through the scene. This class requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER_QT` is defined. Linking with the cmake target `CGAL::CGAL_Basic_viewer_Qt` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER_QT`.
 
 CGAL::QGLViewer is our internal fork of <a href="https://github.com/GillesDebunne/libQGLViewer">QGLViewer class</a> which is <em>A versatile 3D OpenGL viewer based on QOpenGLWidget</em>.
 */
@@ -207,7 +207,7 @@ class Basic_viewer : public CGAL::QGLViewer
 
 The class `QApplication_and_basic_viewer` regroups a `Basic_viewer` and Qt `QApplication`. The `QApplication` is created in the constructor, but started by the `run()` method. This allows for example users to modify the `on_key_pressed` method of the `Basic_viewer` to define their own behavior.
 
-This class requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` or `CGAL_USE_BASIC_VIEWER_QT` is defined. Linking with the cmake target `CGAL::CGAL_Basic_viewer` or `CGAL::CGAL_Basic_viewer_Qt` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER` & `CGAL_USE_BASIC_VIEWER_QT`.
+This class requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER_QT` is defined. Linking with the cmake target `CGAL::CGAL_Basic_viewer_Qt` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER_QT`.
 
 */
 class QApplication_and_basic_viewer
@@ -230,7 +230,7 @@ class QApplication_and_basic_viewer
 /*!
  \ingroup PkgBasicViewerClasses
 
- opens a new window and draws the given `Graphics_scene` (which must have been filled before). `title` will be the title of the window.  A call to this method is blocking, that is the program continues as soon as the user closes the window. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` is defined. Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition CGAL_USE_BASIC_VIEWER.
+ opens a new window and draws the given `Graphics_scene` (which must have been filled before). `title` will be the title of the window.  A call to this method is blocking, that is the program continues as soon as the user closes the window. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER_QT` is defined. Linking with the cmake target `CGAL::CGAL_Basic_viewer_Qt` will link with `CGAL_Qt6` and add the definition CGAL_USE_BASIC_VIEWER_QT.
 */
 void draw_graphics_scene(const Graphics_scene& graphic_scene,
                          const char *title="CGAL Basic Viewer")

Boolean_set_operations_2/examples/Boolean_set_operations_2/CMakeLists.txt

@@ -16,7 +16,7 @@ foreach(cppfile ${cppfiles})
 endforeach()
 
 if(CGAL_Qt6_FOUND)
-  target_link_libraries(draw_polygon_set PRIVATE CGAL::CGAL_Basic_viewer)
+  target_link_libraries(draw_polygon_set PRIVATE CGAL::CGAL_Basic_viewer_Qt)
 else()
   message(STATUS "NOTICE: The example 'draw_polygon_set' requires Qt and drawing will be disabled.")
 endif()

Boolean_set_operations_2/include/CGAL/draw_polygon_set_2.h

@@ -166,7 +166,7 @@ void compute_elements(const PWH& pwh,
 
 } // End namespace draw_function_for_boolean_set_2
 
-#if defined(CGAL_USE_BASIC_VIEWER_QT) || defined(CGAL_USE_BASIC_VIEWER)
+#if defined(CGAL_USE_BASIC_VIEWER_QT)
 
 template <typename PolygonSet_2, typename GSOptions>
 class Polygon_set_2_basic_viewer_qt : public Basic_viewer
@@ -259,7 +259,7 @@ class Polygon_set_2_basic_viewer_qt : public Basic_viewer
   GSOptions& gso;
 };
 
-#endif // CGAL_USE_BASIC_VIEWER
+#endif // CGAL_USE_BASIC_VIEWER_QT
 
 #define CGAL_PS2_TYPE CGAL::Polygon_set_2<T, C, D>
 
@@ -281,7 +281,7 @@ void add_to_graphics_scene(const CGAL_PS2_TYPE& ap2,
   draw_function_for_boolean_set_2::compute_elements(ap2, graphics_scene, gso);
 }
 
-#ifdef CGAL_USE_BASIC_VIEWER
+#ifdef CGAL_USE_BASIC_VIEWER_QT
 
 // Specialization of draw function.
 template<class T, class C, class D, class GSOptions>
@@ -319,7 +319,7 @@ void draw(const CGAL_PS2_TYPE& ps,
   draw(ps, gso, title);
 }
 
-#endif // CGAL_USE_BASIC_VIEWER_QT || CGAL_USE_BASIC_VIEWER
+#endif // CGAL_USE_BASIC_VIEWER_QT
 
 #undef CGAL_PS2_TYPE
 

Documentation/doc/Documentation/Developer_manual/create_and_use_a_cmakelist.txt

@@ -43,7 +43,7 @@ This section describes a minimal example of a program that uses \cgal and Qt6 fo
 
 
 \skip if(CGAL_Qt6_FOUND)
-\until target_link_libraries(draw_surface_mesh PRIVATE CGAL::CGAL_Basic_viewer)
+\until target_link_libraries(draw_surface_mesh PRIVATE CGAL::CGAL_Basic_viewer_Qt)
 \skip endif
 \until #end of the file
 

Installation/cmake/modules/CGALConfig_binary.cmake.in

@@ -208,10 +208,10 @@ endif()
 #
 # Define a specific target for basic viewer
 #
-if (NOT TARGET CGAL::CGAL_Basic_viewer)
-  add_library(CGAL::CGAL_Basic_viewer INTERFACE IMPORTED GLOBAL)
-    set_target_properties(CGAL::CGAL_Basic_viewer PROPERTIES
-      INTERFACE_COMPILE_DEFINITIONS "CGAL_USE_BASIC_VIEWER;QT_NO_KEYWORDS"
+if (NOT TARGET CGAL::CGAL_Basic_viewer_Qt)
+  add_library(CGAL::CGAL_Basic_viewer_Qt INTERFACE IMPORTED GLOBAL)
+    set_target_properties(CGAL::CGAL_Basic_viewer_Qt PROPERTIES
+      INTERFACE_COMPILE_DEFINITIONS "CGAL_USE_BASIC_VIEWER_QT;QT_NO_KEYWORDS"
       INTERFACE_LINK_LIBRARIES CGAL::CGAL_Qt6)
 endif()
 

Installation/cmake/modules/CGALConfig_install.cmake.in

@@ -193,10 +193,10 @@ endif()
 #
 # Define a specific target for basic viewer
 #
-if (NOT TARGET CGAL::CGAL_Basic_viewer)
-  add_library(CGAL::CGAL_Basic_viewer INTERFACE IMPORTED GLOBAL)
-    set_target_properties(CGAL::CGAL_Basic_viewer PROPERTIES
-      INTERFACE_COMPILE_DEFINITIONS "CGAL_USE_BASIC_VIEWER;QT_NO_KEYWORDS"
+if (NOT TARGET CGAL::CGAL_Basic_viewer_Qt)
+  add_library(CGAL::CGAL_Basic_viewer_Qt INTERFACE IMPORTED GLOBAL)
+    set_target_properties(CGAL::CGAL_Basic_viewer_Qt PROPERTIES
+      INTERFACE_COMPILE_DEFINITIONS "CGAL_USE_BASIC_VIEWER_QT;QT_NO_KEYWORDS"
       INTERFACE_LINK_LIBRARIES CGAL::CGAL_Qt6)
 endif()
 

Installation/cmake/modules/CGAL_add_test.cmake

@@ -124,7 +124,7 @@ function(cgal_add_compilation_test exe_name)
   if(TARGET CGAL_Qt6_moc_and_resources) # if CGAL_Qt6 was searched, and is header-only
     get_property(linked_libraries TARGET "${exe_name}" PROPERTY LINK_LIBRARIES)
     #  message(STATUS "${exe_name} depends on ${linked_libraries}")
-    if( ("CGAL_Qt6" IN_LIST linked_libraries OR "CGAL::CGAL_Qt6" IN_LIST linked_libraries OR "CGAL::CGAL_Basic_viewer" IN_LIST linked_libraries)
+    if( ("CGAL_Qt6" IN_LIST linked_libraries OR "CGAL::CGAL_Qt6" IN_LIST linked_libraries OR "CGAL::CGAL_Basic_viewer_Qt" IN_LIST linked_libraries)
         AND NOT TARGET "compilation_of__CGAL_Qt6_moc_and_resources")
       # This custom target is useless. It is used only as a flag to
       # detect that the test has already been created.