fix the mentions of CGAL_USE_BASIC_VIEWER_QT (with the Qt suffix)

This commit is contained in:
Laurent Rineau 2025-05-02 09:22:38 +02:00
parent 991418e64e
commit 010adccdec
29 changed files with 45 additions and 42 deletions

View File

@ -29,8 +29,11 @@ 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` (Qt 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`.
* 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` is defined. Linking with the cmake target
* `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition
* `CGAL_USE_BASIC_VIEWER`.
*
* \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

View File

@ -7,7 +7,7 @@
#include <CGAL/Graphics_scene_options.h>
#include <CGAL/Basic_viewer.h>
#ifdef CGAL_USE_BASIC_VIEWER_QT
#ifdef CGAL_USE_BASIC_VIEWER
#include <QMainWindow>
#endif
@ -55,7 +55,7 @@ int main(void)
CGAL::add_to_graphics_scene(output_mesh, scene2);
/// (2) Qt code that create windows, add them in a layout, and create app.
#ifdef CGAL_USE_BASIC_VIEWER_QT
#ifdef CGAL_USE_BASIC_VIEWER
#if defined(CGAL_TEST_SUITE)
bool cgal_test_suite=true;

View File

@ -103,7 +103,7 @@ int main(int argc, char* argv[])
add_to_graphics_scene(sm, gs, gsosm);
#ifdef CGAL_USE_BASIC_VIEWER_QT
#ifdef CGAL_USE_BASIC_VIEWER
CGAL::Qt::QApplication_and_basic_viewer app(gs, "Small faces");
if(app)

View File

@ -2033,6 +2033,6 @@ void draw_graphics_scene(const Graphics_scene& graphics_scene,
} // End namespace CGAL
#endif // CGAL_USE_BASIC_VIEWER_QT
#endif // CGAL_USE_BASIC_VIEWER
#endif // CGAL_QT_BASIC_VIEWER_H

View File

@ -27,8 +27,8 @@ struct Graphics_scene_options_polygon_set_2: public CGAL::Graphics_scene_options
opens a new window and draws a 2D polygon set. 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 viewer) is defined.
Linking with the cmake target `CGAL::CGAL_Basic_viewer`/`CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`/`CGAL_USE_BASIC_VIEWER`.
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` is defined.
Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
\tparam PS2 which must be an instantiation of a `CGAL::Polygon_set_2<...>`.
\tparam GSOptions a model of `GraphicsSceneOptionsPolygonSet2` concept.

View File

@ -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)
#if defined(CGAL_USE_BASIC_VIEWER)
template <typename PolygonSet_2, typename GSOptions>
class Polygon_set_2_basic_viewer_qt : public Basic_viewer
@ -261,7 +261,7 @@ private:
GSOptions& gso;
};
#endif // CGAL_USE_BASIC_VIEWER_QT
#endif // CGAL_USE_BASIC_VIEWER
#define CGAL_PS2_TYPE CGAL::Polygon_set_2<T, C, D>
@ -292,7 +292,7 @@ void draw(const CGAL_PS2_TYPE& ps, GSOptions& gso,
CGAL_USE(gso);
CGAL_USE(title);
#ifdef CGAL_USE_BASIC_VIEWER_QT
#ifdef CGAL_USE_BASIC_VIEWER
#if defined(CGAL_TEST_SUITE)
bool cgal_test_suite = true;
#else
@ -311,7 +311,7 @@ void draw(const CGAL_PS2_TYPE& ps, GSOptions& gso,
basic_viewer.show();
app.exec();
}
#endif // CGAL_USE_BASIC_VIEWER_QT
#endif // CGAL_USE_BASIC_VIEWER
}
template<class T, class C, class D>

View File

@ -211,7 +211,7 @@ endif()
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_COMPILE_DEFINITIONS "CGAL_USE_BASIC_VIEWER;QT_NO_KEYWORDS"
INTERFACE_LINK_LIBRARIES CGAL::CGAL_Qt6)
add_library(CGAL::CGAL_Basic_viewer ALIAS CGAL::CGAL_Basic_viewer_Qt)
endif()

View File

@ -196,9 +196,9 @@ endif()
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_COMPILE_DEFINITIONS "CGAL_USE_BASIC_VIEWER;QT_NO_KEYWORDS"
INTERFACE_LINK_LIBRARIES CGAL::CGAL_Qt6)
add_library(CGAL::CGAL_Basic_viewer ALIAS CGAL::CGAL_Basic_viewer_Qt)
add_library(CGAL::CGAL_Basic_viewer ALIAS CGAL::CGAL_Basic_viewer_Qt)
endif()
include("${CGAL_MODULES_DIR}/CGAL_enable_end_of_configuration_hook.cmake")

View File

@ -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_Qt" IN_LIST 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)
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.

View File

@ -110,7 +110,7 @@ function(CGAL_hook_fix_ctest_depending_on_Qt6)
continue()
endif()
get_property(_target_links TARGET ${_target} PROPERTY LINK_LIBRARIES)
if("CGAL_Qt6" IN_LIST _target_links OR "CGAL::CGAL_Qt6" IN_LIST _target_links OR "CGAL::CGAL_Basic_viewer_Qt" IN_LIST _target_links)
if("CGAL_Qt6" IN_LIST _target_links OR "CGAL::CGAL_Qt6" IN_LIST _target_links OR "CGAL::CGAL_Basic_viewer" IN_LIST _target_links)
set_property(TEST "compilation of ${_target}" APPEND PROPERTY FIXTURES_REQUIRED CGAL_Qt6_moc_and_resources_Fixture)
endif()
endforeach()

View File

@ -199,7 +199,7 @@ endforeach()
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"
INTERFACE_COMPILE_DEFINITIONS "CGAL_USE_BASIC_VIEWER"
INTERFACE_LINK_LIBRARIES CGAL::CGAL_Qt6)
add_library(CGAL::CGAL_Basic_viewer ALIAS CGAL::CGAL_Basic_viewer_Qt)
endif()

View File

@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.12...3.31)
project(test_configuration)
find_package(CGAL COMPONENTS Qt6)
add_definitions(-DCGAL_USE_BASIC_VIEWER_QT -DQT_NO_KEYWORDS)
add_definitions(-DCGAL_USE_BASIC_VIEWER -DQT_NO_KEYWORDS)
get_filename_component(CGAL_DIR_PATH "${CGAL_DIR}/CMakeConfig.cmake" DIRECTORY)
get_filename_component(CGAL_GIVEN_DIR_PATH "${CGAL_GIVEN_DIR}/CMakeConfig.cmake" DIRECTORY)

View File

@ -40,7 +40,7 @@ if(NOT CGAL_Qt6_FOUND OR NOT Qt6_FOUND)
else()
add_compile_definitions(CGAL_USE_BASIC_VIEWER_QT QT_NO_KEYWORDS)
add_compile_definitions(CGAL_USE_BASIC_VIEWER QT_NO_KEYWORDS)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON)

View File

@ -5,7 +5,7 @@ namespace CGAL {
opens a new window and draws a linear cell complex. 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` (Qt viewer) is defined.
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` is defined.
Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
\tparam LCC which must be an instantiation of a `CGAL::Linear_cell_complex_for_combinatorial_map<...>` or `CGAL::Linear_cell_complex_for_generalized_map<...>`.

View File

@ -5,7 +5,7 @@ namespace CGAL {
opens a new window and draws a nef polyhedron. 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` (Qt viewer) is defined.
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` is defined.
Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
\tparam NP3 which must be an instantiation of a `CGAL::Nef_polyhedron_3<...>`.

View File

@ -27,7 +27,7 @@ struct Graphics_scene_options_periodic_2_triangulation_2: public CGAL::Graphics_
opens a new window and draws a periodic 2D triangulation. 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` (Qt viewer) is defined.
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` is defined.
Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
\tparam P2T2 which must be an instantiation of a `CGAL::Periodic_2_triangulation_2<...>`.

View File

@ -230,7 +230,7 @@ void draw(const CGAL_P2T2_TYPE& ap2t2,
CGAL_USE(gs_options);
CGAL_USE(title);
#if defined(CGAL_USE_BASIC_VIEWER_QT)
#if defined(CGAL_USE_BASIC_VIEWER)
CGAL::Graphics_scene gs;
add_to_graphics_scene(ap2t2, gs, gs_options);
CGAL::Qt::QApplication_and_basic_viewer app(gs, title);
@ -267,7 +267,7 @@ void draw(const CGAL_P2T2_TYPE& ap2t2,
// Then we run the app
app.run();
}
#endif // CGAL_USE_BASIC_VIEWER_QT
#endif // CGAL_USE_BASIC_VIEWER
}
template<class Gt, class Tds>

View File

@ -28,7 +28,7 @@ namespace CGAL {
opens a new window and draws a point set. 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` (Qt viewer) is defined.
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` is defined.
Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
\tparam PS which must be an instantiation of a `CGAL::Point_set_3<...>`.

View File

@ -47,7 +47,7 @@ void draw(const MPH& aph);
namespace CGAL {
#if defined(CGAL_USE_BASIC_VIEWER_QT)
#if defined(CGAL_USE_BASIC_VIEWER)
#include <CGAL/Qt/init_ogl_context.h>
@ -180,7 +180,7 @@ private:
const Mpwh& m_mpwh;
};
#endif // CGAL_USE_BASIC_VIEWER_QT
#endif // CGAL_USE_BASIC_VIEWER
// Specialization of draw function.
template<class T, class C>
@ -190,7 +190,7 @@ void draw(const CGAL::Multipolygon_with_holes_2<T, C>& mpwh,
CGAL_USE(mpwh);
CGAL_USE(title);
#if defined(CGAL_USE_BASIC_VIEWER_QT)
#if defined(CGAL_USE_BASIC_VIEWER)
#if defined(CGAL_TEST_SUITE)
bool cgal_test_suite = true;
#else
@ -209,7 +209,7 @@ void draw(const CGAL::Multipolygon_with_holes_2<T, C>& mpwh,
mainwindow.show();
app.exec();
}
#endif // CGAL_USE_BASIC_VIEWER_QT
#endif // CGAL_USE_BASIC_VIEWER
}
} // End namespace CGAL

View File

@ -31,7 +31,7 @@ namespace CGAL {
opens a new window and draws a 2D polygon. 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` (Qt viewer) is defined.
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` is defined.
Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
\tparam P which must be an instantiation of a `CGAL::Polygon_2<...>`.

View File

@ -31,7 +31,7 @@ namespace CGAL {
opens a new window and draws a 2D polygon with holes. 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` (Qt viewer) is defined.
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` is defined.
Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
\tparam PH which must be an instantiation of a `CGAL::Polygon_with_holes_2<...>`.

View File

@ -5,7 +5,7 @@ namespace CGAL {
opens a new window and draws a polyhedron. 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` (Qt viewer) is defined.
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` is defined.
Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
\tparam P which must be an instantiation of a `CGAL::Polyhedron_3<...>`.

View File

@ -20,7 +20,7 @@
opens a new window and draws a surface mesh. 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` (Qt viewer) is defined.
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` is defined.
Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
\tparam SM which must be an instantiation of a `CGAL::Surface_mesh<...>`.

View File

@ -5,7 +5,7 @@ namespace CGAL {
opens a new window and draws `amesh`, either a 2D linear cell complex or a model of the FaceGraph concept, plus the paths lying on this mesh given in `apaths`. 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` (Qt viewer) is defined.
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` is defined.
Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
\tparam Mesh either a 2D linear cell complex or a model of the FaceGraph concept.

View File

@ -5,8 +5,8 @@ namespace CGAL {
opens a new window and draws a constrained triangulation. If the triangulation has constraints they are drawn. The faces inside and outside of the domain, based on the property map, are drawn in different colors.
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 viewer) is defined.
Linking with the cmake target `CGAL::CGAL_Basic_viewer`/`CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`/`CGAL_USE_BASIC_VIEWER`.
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` is defined.
Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
\tparam CT2 which must be an instantiation of a `CGAL::Constrained_triangulation_2<...>`.
\tparam InDomainPMap a class model of `ReadablePropertyMap` with `CT2::Face_handle` as key type and `bool` as value type.

View File

@ -5,7 +5,7 @@ namespace CGAL {
opens a new window and draws a triangulation. 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` (Qt viewer) is defined.
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` is defined.
Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
\tparam T2 which must be an instantiation of a `CGAL::Triangulation_2<...>`.

View File

@ -5,7 +5,7 @@ namespace CGAL {
opens a new window and draws a 3D triangulation. 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` (Qt viewer) is defined.
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` is defined.
Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
\tparam T3 which must be an instantiation of a `CGAL::Triangulation_3<...>`.

View File

@ -27,7 +27,7 @@ struct Graphics_scene_options_voronoi_diagram_2: public CGAL::Graphics_scene_opt
opens a new window and draws a 2D voronoi diagram. 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` (Qt viewer) is defined.
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` is defined.
Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
\tparam VD2 which must be an instantiation of a `CGAL::Voronoi_diagram_2<...>`.

View File

@ -382,7 +382,7 @@ void draw(const CGAL_VORONOI_TYPE& av2,
CGAL_USE(title);
#if defined(CGAL_USE_BASIC_VIEWER_QT)
#if defined(CGAL_USE_BASIC_VIEWER)
CGAL::Qt::QApplication_and_basic_viewer app(buffer, title);
if(app)
@ -437,7 +437,7 @@ void draw(const CGAL_VORONOI_TYPE& av2,
// Then we run the app
app.run();
}
#endif // CGAL_USE_BASIC_VIEWER_QT
#endif // CGAL_USE_BASIC_VIEWER
}
template<class DG, class AT, class AP>