Skip to content

Commit

Permalink
Remove a few occurrences of CGAL_Qt5
Browse files Browse the repository at this point in the history
... and replace by CGAL_Qt6
  • Loading branch information
lrineau committed Sep 14, 2023
1 parent e93a099 commit 2f6d51b
Show file tree
Hide file tree
Showing 43 changed files with 134 additions and 275 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6750,8 +6750,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_Qt5`, 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_Qt5` and add the definition `CGAL_USE_BASIC_VIEWER`.
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`.

\cgalFigureBegin{aos_fig-draw_arr,draw_arr.png}
A snapshot of the window created by the program
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ namespace CGAL {
* opens a new window and draws `arr`, an instance of the `CGAL::Arrangement_2`
* class template. A call to this function is blocking; that is, the program
* continues only after the user closes the window. This function requires
* `CGAL_Qt5`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` is
* `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_Qt5` and add the definition `CGAL_USE_BASIC_VIEWER`.
* 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ namespace CGAL {
/*!
\ingroup PkgDrawPolygonSet2
opens a new window and draws `aps`, an instance of the `CGAL::Polygon_set_2` class. A call to this function is blocking, that is the program continues as soon as the user closes the window. This function requires `CGAL_Qt5`, 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_Qt5` and add the definition `CGAL_USE_BASIC_VIEWER`.
opens a new window and draws `aps`, an instance of the `CGAL::Polygon_set_2` class. A call to this function 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`.
\tparam PS an instance of the `CGAL::Polygon_set_2` class.
\param aps the polygon set to draw.
Expand Down
4 changes: 2 additions & 2 deletions Boolean_set_operations_2/include/CGAL/draw_polygon_set_2.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ namespace CGAL {
*
* opens a new window and draws `aps`, an instance of the `CGAL::Polygon_set_2`
* class. A call to this function is blocking, that is the program continues as
* soon as the user closes the window. This function requires `CGAL_Qt5`, and is
* 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_Qt5` and add
* the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add
* the definition `CGAL_USE_BASIC_VIEWER`.
* \tparam PS an instance of the `CGAL::Polygon_set_2` class.
* \param aps the polygon set to draw.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ This section describes a minimal example of a program that uses \cgal and Qt5 fo
\skip cmake_minimum_required
\until project

\skip #CGAL_Qt5 is needed for the drawing.
\skip #CGAL_Qt6 is needed for the drawing.
\until endif()

\skip #create the executable of the application
\until "draw_surface_mesh.cpp"

\skip if(CGAL_Qt5_FOUND)
\until target_link_libraries(draw_surface_mesh PUBLIC CGAL::CGAL_Qt5)
\skip if(CGAL_Qt6_FOUND)
\until target_link_libraries(draw_surface_mesh PUBLIC CGAL::CGAL_Qt6)
\skip endif
\until #end of the file

Expand Down
2 changes: 1 addition & 1 deletion Documentation/doc/Documentation/Third_party.txt
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ we recommend that you define the environment variable
\subsection thirdpartyMPFR GNU Multiple Precision Arithmetic (GMP) and GNU Multiple Precision Floating-Point Reliably (MPFR) Libraries
<b>GMP Version 4.2 or later, MPFR Version 2.2.1 or later</b>

The components `libCGAL`, `libCGAL_Core`, and `libCGAL_Qt5` require
The components `libCGAL`, `libCGAL_Core`, and `libCGAL_Qt6` require
\gmp and \mpfr which are libraries for multi precision integers and rational numbers,
and for multi precision floating point numbers.

Expand Down
2 changes: 1 addition & 1 deletion Documentation/doc/scripts/test_doxygen_versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ if [ "$HAS_REF" -ne "1" ]; then
if [ $IS_RELEASE = 0 ]; then
cd $ROOT
mkdir -p ./build && cd ./build
cmake -DWITH_CGAL_Core=false -DWITH_CGAL_ImageIO=false -DWITH_CGAL_Qt5=false .. 1>> ./build_logs
cmake -DWITH_CGAL_Core=false -DWITH_CGAL_ImageIO=false -DWITH_CGAL_Qt6=false .. 1>> ./build_logs
CGAL_NAME="$(cat $PWD/VERSION)"
cd $ROOT
rm -rf ./build
Expand Down
4 changes: 2 additions & 2 deletions GraphicsView/include/CGAL/Qt/CGAL_Qt_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

#include <QtCore/qglobal.h>

#if defined(CGAL_Qt5_DLL)
# if defined(CGAL_Qt5_EXPORTS)
#if defined(CGAL_Qt6_DLL)
# if defined(CGAL_Qt6_EXPORTS)
# define CGAL_QT_EXPORT Q_DECL_EXPORT
# else
# define CGAL_QT_EXPORT Q_DECL_IMPORT
Expand Down
4 changes: 2 additions & 2 deletions GraphicsView/include/CGAL/auto_link/Qt.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
#include <QtCore/qglobal.h>

#if (! defined (CGAL_NO_AUTOLINK_QT))
#if ( ! defined( CGAL_EXPORTS ) && (! defined ( CGAL_Qt5_EXPORTS )))
#if ( ! defined( CGAL_EXPORTS ) && (! defined ( CGAL_Qt6_EXPORTS )))

// If CGAL_EXPORTS is defined it means that we are building the CGAL
// library as a DLL. The CGAL.dll does not really depend on CGAL_Qt,
// whatever the header inclusion graph says.

#define CGAL_LIB_NAME CGAL_Qt5
#define CGAL_LIB_NAME CGAL_Qt6

#include <CGAL/auto_link/auto_link.h>

Expand Down
2 changes: 1 addition & 1 deletion GraphicsView/include/CGAL/export/Qt.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#if ( defined(CGAL_BUILD_SHARED_LIBS) && ( ! defined(CGAL_HEADER_ONLY) ) ) \
|| defined(CGAL_USE_Qt5_RESOURCES)

# if defined(CGAL_Qt5_EXPORTS) || defined(CGAL_USE_Qt5_RESOURCES)
# if defined(CGAL_Qt6_EXPORTS) || defined(CGAL_USE_Qt5_RESOURCES)
// defined by CMake or in cpp files of the dll

# define CGAL_QT_EXPORT CGAL_DLL_EXPORT
Expand Down
25 changes: 0 additions & 25 deletions Installation/cmake/modules/CGAL_Qt5_moc_and_resource_files.cmake

This file was deleted.

127 changes: 0 additions & 127 deletions Installation/cmake/modules/CGAL_SetupCGAL_Qt5Dependencies.cmake

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function(CGAL_hook_check_targets)
endif()
get_property(_targets DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY BUILDSYSTEM_TARGETS)
set(_list_of_deps)
set(_special_targets demos examples tests ALL_CGAL_TARGETS CGAL_Qt5_moc_and_resources uninstall install_FindCGAL)
set(_special_targets demos examples tests ALL_CGAL_TARGETS CGAL_Qt6_moc_and_resources uninstall install_FindCGAL)
foreach(t ${_special_targets})
if(NOT TARGET ${t})
continue()
Expand Down Expand Up @@ -110,8 +110,8 @@ function(CGAL_hook_fix_ctest_depending_on_Qt5)
continue()
endif()
get_property(_target_links TARGET ${_target} PROPERTY LINK_LIBRARIES)
if("CGAL_Qt5" IN_LIST _target_links OR "CGAL::CGAL_Qt5" IN_LIST _target_links)
set_property(TEST "compilation of ${_target}" APPEND PROPERTY FIXTURES_REQUIRED CGAL_Qt5_moc_and_resources_Fixture)
if("CGAL_Qt6" IN_LIST _target_links OR "CGAL::CGAL_Qt6" IN_LIST _target_links)
set_property(TEST "compilation of ${_target}" APPEND PROPERTY FIXTURES_REQUIRED CGAL_Qt6_moc_and_resources_Fixture)
endif()
endforeach()
endfunction()
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.. cmake-module:: ../CGAL_SetupCGAL_Qt6Dependencies.cmake
2 changes: 1 addition & 1 deletion Installation/cmake/modules/Help/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Contents:
CGAL_SetupBoost
CGAL_SetupCGALDependencies
CGAL_SetupCGAL_CoreDependencies
CGAL_SetupCGAL_Qt5Dependencies
CGAL_SetupCGAL_Qt6Dependencies
CGAL_SetupCGAL_ImageIODependencies

TODO
Expand Down
Loading

0 comments on commit 2f6d51b

Please sign in to comment.