mirror of https://github.com/CGAL/cgal
Remove a few occurrences of CGAL_Qt5
... and replace by CGAL_Qt6
This commit is contained in:
Laurent Rineau
parent
e93a09901c
commit
2f6d51b49b
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
if(CGAL_Qt5_moc_and_resource_files_included)
|
||||
return()
|
||||
endif()
|
||||
set(CGAL_Qt5_moc_and_resource_files_included TRUE)
|
||||
# qrc files (resources files, that contain icons, at least)
|
||||
if(EXISTS ${CGAL_GRAPHICSVIEW_PACKAGE_DIR}/demo/resources/CGAL.qrc)
|
||||
qt5_add_resources (_CGAL_Qt5_RESOURCE_FILES_private
|
||||
${CGAL_GRAPHICSVIEW_PACKAGE_DIR}/demo/resources/CGAL.qrc
|
||||
${CGAL_GRAPHICSVIEW_PACKAGE_DIR}/demo/icons/Input.qrc
|
||||
${CGAL_GRAPHICSVIEW_PACKAGE_DIR}/demo/icons/File.qrc
|
||||
${CGAL_GRAPHICSVIEW_PACKAGE_DIR}/demo/icons/Triangulation_2.qrc)
|
||||
else()
|
||||
# Installed version, in CMake resources
|
||||
file ( COPY
|
||||
${CGAL_MODULES_DIR}/demo/resources
|
||||
${CGAL_MODULES_DIR}/demo/icons
|
||||
DESTINATION ${CMAKE_BINARY_DIR})
|
||||
qt5_add_resources (_CGAL_Qt5_RESOURCE_FILES_private
|
||||
${CMAKE_BINARY_DIR}/resources/CGAL.qrc
|
||||
${CMAKE_BINARY_DIR}/icons/Input.qrc
|
||||
${CMAKE_BINARY_DIR}/icons/File.qrc
|
||||
${CMAKE_BINARY_DIR}/icons/Triangulation_2.qrc)
|
||||
endif()
|
||||
|
||||
qt5_wrap_ui(_CGAL_Qt5_UI_FILES ${CGAL_GRAPHICSVIEW_PACKAGE_DIR}/include/CGAL/Qt/ImageInterface.ui)
|
||||
|
|
@ -1,127 +0,0 @@
|
|||
#.rst:
|
||||
# CGAL_SetupCGAL_Qt5Dependencies
|
||||
# ------------------------------
|
||||
#
|
||||
# The module searches for the dependencies of the `CGAL_Qt5` library:
|
||||
# - the `Qt5` libraries
|
||||
#
|
||||
# by calling
|
||||
#
|
||||
# .. code-block:: cmake
|
||||
#
|
||||
# find_package(Qt5 QUIET COMPONENTS OpenGL Widgets)
|
||||
#
|
||||
# and defines the variable :variable:`CGAL_Qt5_FOUND` and the function
|
||||
# :command:`CGAL_setup_CGAL_Qt5_dependencies`.
|
||||
#
|
||||
|
||||
if(CGAL_SetupCGAL_Qt5Dependencies_included)
|
||||
return()
|
||||
endif()
|
||||
set(CGAL_SetupCGAL_Qt5Dependencies_included TRUE)
|
||||
|
||||
#.rst:
|
||||
# Used Modules
|
||||
# ^^^^^^^^^^^^
|
||||
# - :module:`Qt5Config`
|
||||
find_package(Qt5 QUIET COMPONENTS OpenGL Widgets OPTIONAL_COMPONENTS Svg)
|
||||
|
||||
set(CGAL_Qt5_MISSING_DEPS "")
|
||||
if(NOT Qt5OpenGL_FOUND)
|
||||
set(CGAL_Qt5_MISSING_DEPS "Qt5OpenGL")
|
||||
endif()
|
||||
if(NOT Qt5Widgets_FOUND)
|
||||
set(CGAL_Qt5_MISSING_DEPS "${CGAL_Qt5_MISSING_DEPS} Qt5Widgets")
|
||||
endif()
|
||||
if(NOT Qt5_FOUND)
|
||||
set(CGAL_Qt5_MISSING_DEPS "${CGAL_Qt5_MISSING_DEPS} Qt5")
|
||||
endif()
|
||||
if(NOT EXISTS ${CGAL_GRAPHICSVIEW_PACKAGE_DIR}/include/CGAL/Qt/GraphicsItem.h)
|
||||
set(CGAL_Qt5_MISSING_DEPS "${CGAL_Qt5_MISSING_DEPS} <CGAL/Qt/*.h> headers")
|
||||
endif()
|
||||
|
||||
#.rst:
|
||||
# Result Variables
|
||||
# ^^^^^^^^^^^^^^^^
|
||||
#
|
||||
# .. variable:: CGAL_Qt5_FOUND
|
||||
#
|
||||
# Set to `TRUE` if the dependencies of `CGAL_Qt5` were found.
|
||||
#
|
||||
if(NOT CGAL_Qt5_MISSING_DEPS)
|
||||
set(CGAL_Qt5_FOUND TRUE)
|
||||
set_property(GLOBAL PROPERTY CGAL_Qt5_FOUND TRUE)
|
||||
|
||||
include(${CMAKE_CURRENT_LIST_DIR}/CGAL_Qt5_moc_and_resource_files.cmake)
|
||||
|
||||
if(NOT TARGET CGAL_Qt5_moc_and_resources)
|
||||
add_library(CGAL_Qt5_moc_and_resources STATIC
|
||||
${_CGAL_Qt5_MOC_FILES_private}
|
||||
${CGAL_GRAPHICSVIEW_PACKAGE_DIR}/include/CGAL/Qt/GraphicsViewNavigation.h
|
||||
${CGAL_GRAPHICSVIEW_PACKAGE_DIR}/include/CGAL/Qt/DemosMainWindow.h
|
||||
${CGAL_GRAPHICSVIEW_PACKAGE_DIR}/include/CGAL/Qt/GraphicsItem.h
|
||||
${CGAL_GRAPHICSVIEW_PACKAGE_DIR}/include/CGAL/Qt/GraphicsViewInput.h
|
||||
${CGAL_GRAPHICSVIEW_PACKAGE_DIR}/include/CGAL/Qt/camera.h
|
||||
${CGAL_GRAPHICSVIEW_PACKAGE_DIR}/include/CGAL/Qt/frame.h
|
||||
${CGAL_GRAPHICSVIEW_PACKAGE_DIR}/include/CGAL/Qt/keyFrameInterpolator.h
|
||||
${CGAL_GRAPHICSVIEW_PACKAGE_DIR}/include/CGAL/Qt/manipulatedCameraFrame.h
|
||||
${CGAL_GRAPHICSVIEW_PACKAGE_DIR}/include/CGAL/Qt/manipulatedFrame.h
|
||||
${CGAL_GRAPHICSVIEW_PACKAGE_DIR}/include/CGAL/Qt/qglviewer.h
|
||||
${CGAL_GRAPHICSVIEW_PACKAGE_DIR}/include/CGAL/Qt/image_interface.h
|
||||
${_CGAL_Qt5_UI_FILES}
|
||||
${_CGAL_Qt5_RESOURCE_FILES_private})
|
||||
target_include_directories( CGAL_Qt5_moc_and_resources PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
|
||||
set_target_properties(CGAL_Qt5_moc_and_resources PROPERTIES
|
||||
POSITION_INDEPENDENT_CODE TRUE
|
||||
EXCLUDE_FROM_ALL TRUE
|
||||
AUTOMOC TRUE)
|
||||
target_link_libraries(CGAL_Qt5_moc_and_resources PUBLIC CGAL::CGAL Qt5::Widgets Qt5::OpenGL )
|
||||
if(Qt5Svg_FOUND)
|
||||
target_link_libraries(CGAL_Qt5_moc_and_resources PUBLIC Qt5::Svg)
|
||||
endif()
|
||||
add_library(CGAL::CGAL_Qt5_moc_and_resources ALIAS CGAL_Qt5_moc_and_resources)
|
||||
add_library(CGAL::Qt5_moc_and_resources ALIAS CGAL_Qt5_moc_and_resources)
|
||||
endif()
|
||||
|
||||
endif()
|
||||
|
||||
#get_property(QT_UIC_EXECUTABLE TARGET Qt5::uic PROPERTY LOCATION)
|
||||
#message( STATUS "Qt5Core include: ${Qt5Core_INCLUDE_DIRS}" )
|
||||
#message( STATUS "Qt5 libraries: ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Svg_LIBRARIES} ${Qt5OpenGL_LIBRARIES}" )
|
||||
#message( STATUS "Qt5Core definitions: ${Qt5Core_DEFINITIONS}" )
|
||||
#message( STATUS "moc executable: ${QT_MOC_EXECUTABLE}" )
|
||||
#message( STATUS "uic executable: ${QT_UIC_EXECUTABLE}" )
|
||||
|
||||
#.rst:
|
||||
#
|
||||
# Provided Functions
|
||||
# ^^^^^^^^^^^^^^^^^^
|
||||
#
|
||||
# .. command:: CGAL_setup_CGAL_Qt5_dependencies
|
||||
#
|
||||
# Link the target with the dependencies of `CGAL_Qt5`::
|
||||
#
|
||||
# CGAL_setup_CGAL_Qt5_dependencies( target )
|
||||
#
|
||||
# The dependencies are
|
||||
# added using :command:`target_link_libraries` with the ``INTERFACE``
|
||||
# keyword.
|
||||
#
|
||||
function(CGAL_setup_CGAL_Qt5_dependencies target)
|
||||
|
||||
if($ENV{CGAL_FAKE_PUBLIC_RELEASE})
|
||||
target_compile_definitions( ${target} INTERFACE CGAL_FAKE_PUBLIC_RELEASE=1 )
|
||||
endif()
|
||||
target_link_libraries( ${target} INTERFACE CGAL::CGAL)
|
||||
target_link_libraries( ${target} INTERFACE CGAL::Qt5_moc_and_resources)
|
||||
target_link_libraries( ${target} INTERFACE Qt5::OpenGL Qt5::Widgets )
|
||||
|
||||
# Remove -Wdeprecated-copy, for g++ >= 9.0, because Qt5, as of
|
||||
# version 5.12, has a lot of [-Wdeprecated-copy] warnings.
|
||||
if( CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
|
||||
AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "9" )
|
||||
target_compile_options( ${target} INTERFACE "-Wno-deprecated-copy" "-Wno-cast-function-type" )
|
||||
endif()
|
||||
|
||||
endfunction()
|
||||
|
||||
|
|
@ -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()
|
||||
|
|
@ -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()
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
.. cmake-module:: ../CGAL_SetupCGAL_Qt5Dependencies.cmake
|
||||
|
|
@ -0,0 +1 @@
|
|||
.. cmake-module:: ../CGAL_SetupCGAL_Qt6Dependencies.cmake
|
||||
|
|
@ -16,7 +16,7 @@ Contents:
|
|||
CGAL_SetupBoost
|
||||
CGAL_SetupCGALDependencies
|
||||
CGAL_SetupCGAL_CoreDependencies
|
||||
CGAL_SetupCGAL_Qt5Dependencies
|
||||
CGAL_SetupCGAL_Qt6Dependencies
|
||||
CGAL_SetupCGAL_ImageIODependencies
|
||||
|
||||
TODO
|
||||
|
|
|
|||
|
|
@ -78,10 +78,10 @@ else()
|
|||
set(NON_STANDARD_INSTALL_PREFIX ${CMAKE_BINARY_DIR})
|
||||
endif()
|
||||
|
||||
if(WITH_CGAL_Qt5)
|
||||
if(WITH_CGAL_Qt6)
|
||||
find_package(Qt6 QUIET COMPONENTS Core)
|
||||
if(Qt5_FOUND)
|
||||
create_link_to_program(CGAL_Qt5)
|
||||
if(Qt6_FOUND)
|
||||
create_link_to_program(CGAL_Qt6)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
|
@ -152,12 +152,12 @@ file(MAKE_DIRECTORY "${NON_STANDARD_INSTALL_PREFIX}/non_standard_install")
|
|||
file(MAKE_DIRECTORY ${NON_STANDARD_INSTALL_PREFIX}/non_standard_build)
|
||||
file(MAKE_DIRECTORY ${NON_STANDARD_INSTALL_PREFIX}/test_config_file)
|
||||
|
||||
if(CGAL_Qt5_FOUND)
|
||||
file(MAKE_DIRECTORY ${NON_STANDARD_INSTALL_PREFIX}/non_standard_install_qt5)
|
||||
file(MAKE_DIRECTORY ${NON_STANDARD_INSTALL_PREFIX}/non_standard_build_qt5)
|
||||
file(MAKE_DIRECTORY ${NON_STANDARD_INSTALL_PREFIX}/test_config_file_qt5)
|
||||
configure_file(test_configuration_qt5.cmake.in ${CMAKE_BINARY_DIR}/test_config_file_qt5/CMakeLists.txt @ONLY)
|
||||
endif()#CGAL_Qt5_FOUND
|
||||
if(CGAL_Qt6_FOUND)
|
||||
file(MAKE_DIRECTORY ${NON_STANDARD_INSTALL_PREFIX}/non_standard_install_qt)
|
||||
file(MAKE_DIRECTORY ${NON_STANDARD_INSTALL_PREFIX}/non_standard_build_qt)
|
||||
file(MAKE_DIRECTORY ${NON_STANDARD_INSTALL_PREFIX}/test_config_file_qt)
|
||||
configure_file(test_configuration_qt.cmake.in ${CMAKE_BINARY_DIR}/test_config_file_qt/CMakeLists.txt @ONLY)
|
||||
endif()#CGAL_Qt6_FOUND
|
||||
|
||||
#If ctest is ran from a global config, CGAL_SOURCE_DIR exists, but from Installation/test it doesn't. In that case, however, there is a CGAL_DIR.
|
||||
if("${CGAL_SOURCE_DIR}" STREQUAL "")
|
||||
|
|
@ -173,28 +173,28 @@ configure_file(test_configuration.cmake.in ${CMAKE_BINARY_DIR}/test_config_file/
|
|||
|
||||
#test CGAL_DIR = source_dir (Git_root or CGAL-5.x dir.
|
||||
get_filename_component(CGAL_DIR_CORRECT_PATH "${CGAL_SOURCE_DIR}/CGALConfig.cmake" DIRECTORY)
|
||||
add_test(NAME test_config_file
|
||||
add_test(NAME test_config_file_in_CGAL_SOURCE_DIR
|
||||
COMMAND ${CMAKE_COMMAND} ${GENERATOR} ${INIT_FILE} -DCMAKE_BUILD_TYPE=Release -DCGAL_DIR=${CGAL_DIR_CORRECT_PATH} -DCGAL_GIVEN_DIR=${CGAL_DIR_CORRECT_PATH}
|
||||
"${CMAKE_BINARY_DIR}/test_config_file" #src
|
||||
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/build-test_config_file") #build
|
||||
list(APPEND test_config_lst "test_config_file")
|
||||
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/build-test_config_file_in_CGAL_SOURCE_DIR") #build
|
||||
list(APPEND test_config_lst "test_config_file_in_CGAL_SOURCE_DIR")
|
||||
|
||||
if(RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE)#CGAL_BRANCH_BUILD
|
||||
#test CGAL_DIR = CGAL-5.x/lib/cmake/CGAL
|
||||
get_filename_component(CGAL_DIR_CORRECT_PATH "${CGAL_SOURCE_DIR}/lib/cmake/CGAL/CGALConfig.cmake" DIRECTORY)
|
||||
add_test(NAME test_config_file_2
|
||||
add_test(NAME test_config_file_in_lib_cmake_CGAL
|
||||
COMMAND ${CMAKE_COMMAND} ${GENERATOR} ${INIT_FILE} -DCMAKE_BUILD_TYPE=Release -DCGAL_DIR=${CGAL_DIR_CORRECT_PATH} -DCGAL_GIVEN_DIR=${CGAL_DIR_CORRECT_PATH}
|
||||
"${CMAKE_BINARY_DIR}/test_config_file"
|
||||
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/build-test_config_file_2")
|
||||
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/build-test_config_file_in_lib_cmake_CGAL")
|
||||
else()#CGAL_BRANCH_BUILD
|
||||
#use the CGAL_DIR
|
||||
get_filename_component(CGAL_DIR_CORRECT_PATH "${CGAL_SOURCE_DIR}/Installation/lib/cmake/CGAL/CGALConfig.cmake" DIRECTORY)
|
||||
add_test(NAME test_config_file_2
|
||||
add_test(NAME test_config_file_in_lib_cmake_CGAL
|
||||
COMMAND ${CMAKE_COMMAND} ${GENERATOR} ${INIT_FILE} -DCMAKE_BUILD_TYPE=Release -DCGAL_DIR=${CGAL_DIR_CORRECT_PATH} -DCGAL_GIVEN_DIR=${CGAL_DIR_CORRECT_PATH}
|
||||
"${CMAKE_BINARY_DIR}/test_config_file"
|
||||
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/build-test_config_file_2")
|
||||
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/build-test_config_file_in_lib_cmake_CGAL")
|
||||
endif()#CGAL_BRANCH_BUILD
|
||||
list(APPEND test_config_lst "test_config_file_2")
|
||||
list(APPEND test_config_lst "test_config_file_in_lib_cmake_CGAL")
|
||||
|
||||
#configure cgal for a non standard install without Qt6
|
||||
get_filename_component(CORRECT_INSTALL_PATH "${NON_STANDARD_INSTALL_PREFIX}/non_standard_install/dummy.txt" DIRECTORY)
|
||||
|
|
@ -206,40 +206,40 @@ add_test(NAME config_non_standard_cgal
|
|||
add_test(NAME install_non_standard_cgal
|
||||
COMMAND ${CMAKE_COMMAND} --build "${NON_STANDARD_INSTALL_PREFIX}/non_standard_build" --target "install" --config "$<CONFIG>")
|
||||
|
||||
#test CGAL_DIR=non standard place without cgal_qt5
|
||||
#test CGAL_DIR=non standard place without cgal_qt
|
||||
get_filename_component(CGAL_DIR_CORRECT_PATH "${NON_STANDARD_INSTALL_PREFIX}/non_standard_install/lib/cmake/CGAL/CGALConfig.cmake" DIRECTORY)
|
||||
add_test(NAME test_config_file_3
|
||||
add_test(NAME test_config_file_non_standard_install_lib_cmake
|
||||
COMMAND ${CMAKE_COMMAND} ${INIT_FILE} -DCMAKE_BUILD_TYPE=Release -DCGAL_DIR=${CGAL_DIR_CORRECT_PATH} -DCGAL_GIVEN_DIR=${CGAL_DIR_CORRECT_PATH}
|
||||
"${CMAKE_BINARY_DIR}/test_config_file"
|
||||
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/build-test_config_file_3")
|
||||
list(APPEND test_config_lst "test_config_file_3")
|
||||
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/build-test_config_file_non_standard_install_lib_cmake")
|
||||
list(APPEND test_config_lst "test_config_file_non_standard_install_lib_cmake")
|
||||
|
||||
if(CGAL_Qt5_FOUND)
|
||||
if(CGAL_Qt6_FOUND)
|
||||
#configure cgal for a non standard install with Qt6
|
||||
add_test(NAME config_non_standard_cgal_qt5
|
||||
COMMAND ${CMAKE_COMMAND} ${INIT_FILE} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${NON_STANDARD_INSTALL_PREFIX}/non_standard_install_qt5 -DCGAL_INSTALL_LIB_DIR=lib
|
||||
add_test(NAME config_non_standard_cgal_qt
|
||||
COMMAND ${CMAKE_COMMAND} ${INIT_FILE} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${NON_STANDARD_INSTALL_PREFIX}/non_standard_install_qt -DCGAL_INSTALL_LIB_DIR=lib
|
||||
"${CGAL_SOURCE_DIR}"
|
||||
WORKING_DIRECTORY "${NON_STANDARD_INSTALL_PREFIX}/non_standard_build_qt5")
|
||||
WORKING_DIRECTORY "${NON_STANDARD_INSTALL_PREFIX}/non_standard_build_qt")
|
||||
#install cgal in the non standard place
|
||||
add_test(NAME install_non_standard_cgal_qt5
|
||||
COMMAND ${CMAKE_COMMAND} --build "${NON_STANDARD_INSTALL_PREFIX}/non_standard_build_qt5" --target "install" --config "$<CONFIG>")
|
||||
add_test(NAME install_non_standard_cgal_qt
|
||||
COMMAND ${CMAKE_COMMAND} --build "${NON_STANDARD_INSTALL_PREFIX}/non_standard_build_qt" --target "install" --config "$<CONFIG>")
|
||||
|
||||
#test CGAL_DIR=non standard place with cgal_qt5
|
||||
get_filename_component(CGAL_DIR_CORRECT_PATH "${NON_STANDARD_INSTALL_PREFIX}/non_standard_install_qt5/lib/cmake/CGAL/CGALConfig.cmake" DIRECTORY)
|
||||
add_test(NAME test_config_file_4
|
||||
#test CGAL_DIR=non standard place with cgal_qt
|
||||
get_filename_component(CGAL_DIR_CORRECT_PATH "${NON_STANDARD_INSTALL_PREFIX}/non_standard_install_qt/lib/cmake/CGAL/CGALConfig.cmake" DIRECTORY)
|
||||
add_test(NAME test_config_file_non_standard_install_lib_cmake_with_qt
|
||||
COMMAND ${CMAKE_COMMAND} ${INIT_FILE} -DCMAKE_BUILD_TYPE=Release -DCGAL_DIR=${CGAL_DIR_CORRECT_PATH} -DCGAL_GIVEN_DIR=${CGAL_DIR_CORRECT_PATH}
|
||||
"${CMAKE_BINARY_DIR}/test_config_file_qt5"
|
||||
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/build-test_config_file_4")
|
||||
list(APPEND test_config_lst "test_config_file_4")
|
||||
endif()#CGAL_Qt5_FOUND
|
||||
"${CMAKE_BINARY_DIR}/test_config_file_qt"
|
||||
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/build-test_config_file_non_standard_install_lib_cmake_with_qt")
|
||||
list(APPEND test_config_lst "test_config_file_non_standard_install_lib_cmake_with_qt")
|
||||
endif()#CGAL_Qt6_FOUND
|
||||
|
||||
#test CGAL_DIR=non standard build
|
||||
get_filename_component(CGAL_DIR_CORRECT_PATH "${NON_STANDARD_INSTALL_PREFIX}/non_standard_build/CGALConfig.cmake" DIRECTORY)
|
||||
add_test(NAME test_config_file_5
|
||||
add_test(NAME test_config_file_non_standard
|
||||
COMMAND ${CMAKE_COMMAND} ${INIT_FILE} -DCMAKE_BUILD_TYPE=Release -DCGAL_DIR=${CGAL_DIR_CORRECT_PATH} -DCGAL_GIVEN_DIR=${CGAL_DIR_CORRECT_PATH}
|
||||
"${CMAKE_BINARY_DIR}/test_config_file"
|
||||
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/build-test_config_file_5")
|
||||
list(APPEND test_config_lst "test_config_file_5")
|
||||
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/build-test_config_file_non_standard")
|
||||
list(APPEND test_config_lst "test_config_file_non_standard")
|
||||
|
||||
foreach(tgt ${test_config_lst})
|
||||
#add_custom_target(${tgt}_target)
|
||||
|
|
@ -268,19 +268,19 @@ foreach(tgt ${test_config_lst})
|
|||
endforeach()
|
||||
|
||||
set_property(TEST install_non_standard_cgal APPEND PROPERTY DEPENDS config_non_standard_cgal)
|
||||
set_property(TEST config_non_standard_cgal APPEND PROPERTY FIXTURES_SETUP test_config_file_3_target)
|
||||
set_property(TEST install_non_standard_cgal APPEND PROPERTY FIXTURES_SETUP test_config_file_3_target)
|
||||
set_property(TEST test_config_file_3 test_config_file_5 APPEND PROPERTY FIXTURES_REQUIRED test_config_file_3_target)
|
||||
set_property(TEST config_non_standard_cgal APPEND PROPERTY FIXTURES_SETUP test_config_file_non_standard_install_lib_cmake_target)
|
||||
set_property(TEST install_non_standard_cgal APPEND PROPERTY FIXTURES_SETUP test_config_file_non_standard_install_lib_cmake_target)
|
||||
set_property(TEST test_config_file_non_standard_install_lib_cmake test_config_file_non_standard APPEND PROPERTY FIXTURES_REQUIRED test_config_file_non_standard_install_lib_cmake_target)
|
||||
|
||||
set_property(TEST install_non_standard_cgal APPEND PROPERTY LABELS Installation_Tests CGAL_cmake_testsuite)
|
||||
set_property(TEST config_non_standard_cgal APPEND PROPERTY LABELS Installation_Tests CGAL_cmake_testsuite)
|
||||
|
||||
if(CGAL_Qt5_FOUND)
|
||||
set_property(TEST install_non_standard_cgal_qt5 APPEND PROPERTY DEPENDS config_non_standard_cgal_qt5)
|
||||
set_property(TEST config_non_standard_cgal_qt5 APPEND PROPERTY FIXTURES_SETUP test_config_file_4_target)
|
||||
set_property(TEST install_non_standard_cgal_qt5 APPEND PROPERTY FIXTURES_SETUP test_config_file_4_target)
|
||||
set_property(TEST test_config_file_4 APPEND PROPERTY FIXTURES_REQUIRED test_config_file_4_target)
|
||||
if(CGAL_Qt6_FOUND)
|
||||
set_property(TEST install_non_standard_cgal_qt APPEND PROPERTY DEPENDS config_non_standard_cgal_qt)
|
||||
set_property(TEST config_non_standard_cgal_qt APPEND PROPERTY FIXTURES_SETUP test_config_file_non_standard_install_lib_cmake_with_qt_target)
|
||||
set_property(TEST install_non_standard_cgal_qt APPEND PROPERTY FIXTURES_SETUP test_config_file_non_standard_install_lib_cmake_with_qt_target)
|
||||
set_property(TEST test_config_file_non_standard_install_lib_cmake_with_qt APPEND PROPERTY FIXTURES_REQUIRED test_config_file_non_standard_install_lib_cmake_with_qt_target)
|
||||
|
||||
set_property(TEST install_non_standard_cgal_qt5 APPEND PROPERTY LABELS Installation_Tests CGAL_cmake_testsuite)
|
||||
set_property(TEST config_non_standard_cgal_qt5 APPEND PROPERTY LABELS Installation_Tests CGAL_cmake_testsuite)
|
||||
endif()#CGAL_Qt5_FOUND
|
||||
set_property(TEST install_non_standard_cgal_qt APPEND PROPERTY LABELS Installation_Tests CGAL_cmake_testsuite)
|
||||
set_property(TEST config_non_standard_cgal_qt APPEND PROPERTY LABELS Installation_Tests CGAL_cmake_testsuite)
|
||||
endif()#CGAL_Qt6_FOUND
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
// Use something defined not in headers but in the CGAL library to test that is was indeed properly built and linked to,
|
||||
|
||||
#include <CGAL/Qt/utility.h>
|
||||
|
||||
typedef QRectF (*mapToSceneFunction)(const QGraphicsView* , const QRect);
|
||||
|
||||
int main()
|
||||
{
|
||||
mapToSceneFunction f = CGAL::Qt::mapToScene;
|
||||
return (&f > 0) ? 0 : 1;
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
cmake_minimum_required(VERSION 3.1...3.23)
|
||||
project(test_configuration)
|
||||
find_package(CGAL COMPONENTS Qt5)
|
||||
find_package(CGAL COMPONENTS Qt6)
|
||||
add_definitions(-DCGAL_USE_BASIC_VIEWER -DQT_NO_KEYWORDS)
|
||||
|
||||
get_filename_component(CGAL_DIR_PATH "${CGAL_DIR}/CMakeConfig.cmake" DIRECTORY)
|
||||
|
|
@ -10,5 +10,5 @@ if(NOT ${CGAL_DIR_PATH} STREQUAL ${CGAL_GIVEN_DIR_PATH})
|
|||
message("${CGAL_DIR_PATH} != ${CGAL_GIVEN_DIR_PATH}")
|
||||
message( FATAL_ERROR "The CGAL_DIR is wrong !")
|
||||
endif()
|
||||
add_executable(test_configuration @CMAKE_CURRENT_SOURCE_DIR@/test_configuration_qt5.cpp)
|
||||
target_link_libraries(test_configuration PUBLIC CGAL::CGAL CGAL::CGAL_Qt5)
|
||||
add_executable(test_configuration @CMAKE_CURRENT_SOURCE_DIR@/test_configuration_qt.cpp)
|
||||
target_link_libraries(test_configuration PUBLIC CGAL::CGAL CGAL::CGAL_Qt6)
|
||||
|
|
@ -3,8 +3,8 @@ namespace CGAL {
|
|||
/*!
|
||||
\ingroup PkgDrawLinearCellComplex
|
||||
|
||||
opens a new window and draws `alcc`, a model of the `LinearCellComplex` concept. 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 `alcc`, a model of the `LinearCellComplex` concept. 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 LCC a model of the `LinearCellComplex` concept.
|
||||
\param alcc the linear cell complex to draw.
|
||||
|
||||
|
|
|
|||
|
|
@ -265,8 +265,8 @@ A linear cell complex can be visualized by calling the \link PkgDrawLinearCellCo
|
|||
|
||||
\cgalExample{Linear_cell_complex/draw_linear_cell_complex.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{fig_draw_lcc,draw_lcc.png}
|
||||
Result of the run of the draw_linear_cell_complex program. A window shows two 3D cubes and allows to navigate through the 3D scene.
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ namespace CGAL {
|
|||
\ingroup PkgDrawNef3
|
||||
|
||||
Open a new window and draws `anef3`, the `Nef_polyhedron_3`. 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`.
|
||||
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 Nef3 a model of the `Nef_polyhedron_3` concept.
|
||||
\param anef3 the nef polyhedron to draw.
|
||||
|
||||
|
|
|
|||
|
|
@ -424,8 +424,8 @@ A nef polyhedron can be visualised by calling the \link PkgDrawNef3 CGAL::draw<N
|
|||
|
||||
\cgalExample{Nef_3/draw_nef_3.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{fig_draw_nef_polyhedron, draw_nef_3.png}
|
||||
Result of the run of the draw_nef_3 program. A window shows the nef polyhedron and allows to navigate through the 3D scene.
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ namespace CGAL {
|
|||
\ingroup PkgDrawPeriodic2Triangulation2
|
||||
|
||||
opens a new window and draws `ap2t2`, the `Periodic_2_Triangulation_2`. 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`.
|
||||
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 a model of the `Periodic_2TriangulationTraits_2` concept.
|
||||
\param ap2t2 the 2D periodic trinagulation to draw.
|
||||
|
||||
|
|
|
|||
|
|
@ -169,8 +169,8 @@ A 3D point set can be visualized by calling the \link PkgDrawPointSet3D CGAL::dr
|
|||
|
||||
\cgalExample{Point_set_3/draw_point_set_3.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{fig_draw_point_set,draw_point_set.png}
|
||||
Result of the run of the draw_point_set_3 program. A window shows the 3D points and allows to navigate through the 3D scene.
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@ namespace CGAL {
|
|||
/*!
|
||||
\ingroup PkgDrawPointSet3D
|
||||
|
||||
opens a new window and draws `aps`, an instance of the `CGAL::Point_set_3` 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::Point_set_3` 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::Point_set_3` class.
|
||||
\param aps the point set to draw.
|
||||
|
||||
|
|
|
|||
|
|
@ -86,8 +86,8 @@ A polygon can be visualized by calling the \link PkgDrawPolygon2 CGAL::draw<P>(
|
|||
|
||||
\cgalExample{Polygon/draw_polygon.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{fig_draw_polygon,draw_polygon.png}
|
||||
Result of the run of the draw_polygon program. A window shows the polygon and allows to navigate through the scene.
|
||||
|
|
|
|||
|
|
@ -25,8 +25,8 @@ namespace CGAL {
|
|||
/*!
|
||||
\ingroup PkgDrawPolygon2
|
||||
|
||||
opens a new window and draws `ap`, an instance of the `CGAL::Polygon_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 `ap`, an instance of the `CGAL::Polygon_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 P an instance of the `CGAL::Polygon_2` class.
|
||||
\param ap the polygon to draw.
|
||||
|
||||
|
|
|
|||
|
|
@ -28,9 +28,9 @@ namespace CGAL {
|
|||
* opens a new window and draws `aph`, an instance of the
|
||||
* `CGAL::Polygon_with_holes_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
|
||||
* 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 definition
|
||||
* `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition
|
||||
* `CGAL_USE_BASIC_VIEWER`.
|
||||
* \tparam PH an instance of the `CGAL::Polygon_with_holes_2` class.
|
||||
* \param aph the polygon with holes to draw.
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ namespace CGAL {
|
|||
/*!
|
||||
\ingroup PkgDrawPolyhedron
|
||||
|
||||
opens a new window and draws `apoly`, an instance of the `CGAL::Polyhedron_3` 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 `apoly`, an instance of the `CGAL::Polyhedron_3` 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 POLY an instance of the `CGAL::Polyhedron_3` class.
|
||||
\param apoly the polyhedron to draw.
|
||||
|
||||
|
|
|
|||
|
|
@ -284,8 +284,8 @@ A polyhedron can be visualized by calling the \link PkgDrawPolyhedron CGAL::draw
|
|||
|
||||
\cgalExample{Polyhedron/draw_polyhedron.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{fig_draw_polyhedron,draw_polyhedron.png}
|
||||
Result of the run of the draw_polyhedron program. A window shows the polyhedron and allows to navigate through the 3D scene.
|
||||
|
|
|
|||
|
|
@ -388,8 +388,8 @@ A surface mesh can be visualized by calling the \link PkgDrawSurfaceMesh CGAL::d
|
|||
|
||||
\cgalExample{Surface_mesh/draw_surface_mesh.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{fig_draw_surface_mesh,draw_surface_mesh.png}
|
||||
Result of the run of the draw_surface_mesh program. A window shows the surface mesh and allows to navigate through the 3D scene.
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@
|
|||
/*!
|
||||
\ingroup PkgDrawSurfaceMesh
|
||||
|
||||
Open a new window and draw `asm`, an instance of the `CGAL::Surface_mesh` class. The 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`.
|
||||
Open a new window and draw `asm`, an instance of the `CGAL::Surface_mesh` class. The 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 SM an instance of the `CGAL::Surface_mesh` class.
|
||||
\param asm the surface mesh to draw.
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ namespace CGAL {
|
|||
\ingroup PkgDrawFaceGraphWithPaths
|
||||
|
||||
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`.
|
||||
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 flag `CGAL_USE_BASIC_VIEWER` is defined at compile time.
|
||||
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 flag `CGAL_USE_BASIC_VIEWER` is defined at compile time.
|
||||
\tparam Mesh either a 2D linear cell complex or a model of the FaceGraph concept.
|
||||
\param amesh the mesh to draw.
|
||||
\param apaths the paths to draw, which should lie on `amesh`.
|
||||
|
|
@ -17,7 +17,7 @@ void draw(const Mesh& amesh,
|
|||
\ingroup PkgDrawFaceGraphWithPaths
|
||||
|
||||
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`.
|
||||
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 flag `CGAL_USE_BASIC_VIEWER` is defined at compile time.
|
||||
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 flag `CGAL_USE_BASIC_VIEWER` is defined at compile time.
|
||||
\tparam Mesh either a 2D linear cell complex or a model of the FaceGraph concept.
|
||||
\param amesh the mesh to draw.
|
||||
\param apaths the paths to draw, which should lie on `amesh`.
|
||||
|
|
|
|||
|
|
@ -153,20 +153,20 @@ In order to find the edge width of the surface, one can make use of the routine
|
|||
|
||||
\cgalExample{Surface_mesh_topology/edgewidth_surface_mesh.cpp}
|
||||
|
||||
In these two examples, the mesh and the cycles can be visualized if CGAL_Qt5 is enabled.
|
||||
In these two examples, the mesh and the cycles can be visualized if CGAL_Qt6 is enabled.
|
||||
|
||||
\subsection SMTopology_Example_IV Compute Face Width
|
||||
|
||||
The following example computes the face width, and visualizes it if CGAL_Qt5 is enabled.
|
||||
The following example computes the face width, and visualizes it if CGAL_Qt6 is enabled.
|
||||
|
||||
\cgalExample{Surface_mesh_topology/facewidth.cpp}
|
||||
|
||||
\subsection SMTopology_Example_V Basic Homotopy Test
|
||||
The following example shows how to load an off file and how to create three closed paths on this surface. Contractibility and free homotopy tests are then performed. The example also shows how to use the \cgal viewer if CGAL_Qt5 is enabled.
|
||||
The following example shows how to load an off file and how to create three closed paths on this surface. Contractibility and free homotopy tests are then performed. The example also shows how to use the \cgal viewer if CGAL_Qt6 is enabled.
|
||||
\cgalExample{Surface_mesh_topology/path_homotopy_double_torus.cpp}
|
||||
|
||||
\subsection SMTopology_Example_VI Basic Simplicity Test
|
||||
The following example shows how to test the simplicity of a closed path on a double torus. The original path is visualized if CGAL_Qt5 is enabled.
|
||||
The following example shows how to test the simplicity of a closed path on a double torus. The original path is visualized if CGAL_Qt6 is enabled.
|
||||
\cgalExample{Surface_mesh_topology/path_simplicity_double_torus_2.cpp}
|
||||
|
||||
\subsection SMTopology_Example_VI_VII Polygonal Schema
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ with open(report_file, "rt") as test_report:
|
|||
name="libCGALCore_shared"
|
||||
elif name == "libCGAL_ImageIO":
|
||||
name="libCGALimageIO_shared"
|
||||
elif name == "libCGAL_Qt5":
|
||||
elif name == "libCGAL_Qt6":
|
||||
name="libCGALQt5_shared"
|
||||
if name=="incomplete":
|
||||
is_writing=False
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@ has constraints they are drawn. If the face type has a member
|
|||
function `bool is_in_domain()` the faces inside and outside of the
|
||||
domain are drawn in different colors.
|
||||
|
||||
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.
|
||||
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_Qt5` and add the definition `CGAL_USE_BASIC_VIEWER`.
|
||||
`CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
|
||||
|
||||
\tparam T2 a triangulation class derived from `Triangulation_2` or `Constrained_triangulation_2`
|
||||
\param at2 the triangulation to draw.
|
||||
|
|
@ -26,8 +26,8 @@ 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 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`.
|
||||
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 CT2 a triangulation class derived from `Constrained_triangulation_2`
|
||||
\tparam InDomainPMap a class model of `ReadWritePropertyMap` with
|
||||
|
|
|
|||
|
|
@ -509,8 +509,8 @@ A 2D triangulation can be visualized by calling the \link PkgDrawTriangulation2
|
|||
|
||||
\cgalExample{Triangulation_2/draw_triangulation_2.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{fig_draw_triangulation_2,draw_triangulation_2.png}
|
||||
Result of the run of the draw_triangulation_2 program. A window shows the 2D triangulation and allows to navigate through the scene.
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ namespace CGAL {
|
|||
/*!
|
||||
\ingroup PkgDrawTriangulation3
|
||||
|
||||
opens a new window and draws `at3`, a model of the `TriangulationDataStructure_3` concept. 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 `at3`, a model of the `TriangulationDataStructure_3` concept. 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 T3 a model of the `TriangulationDataStructure_3` concept.
|
||||
\param at3 the triangulation to draw.
|
||||
|
||||
|
|
|
|||
|
|
@ -569,8 +569,8 @@ A 3D triangulation can be visualized by calling the \link PkgDrawTriangulation3
|
|||
|
||||
\cgalExample{Triangulation_3/draw_triangulation_3.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{fig_draw_triangulation_3,draw_triangulation_3.png}
|
||||
Result of the run of the draw_triangulation_3 program. A window shows the 3D triangulation and allows to navigate through the 3D scene.
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ namespace CGAL {
|
|||
opens a new window and draws `av2`, the `Voronoi_diagram_2` constructed from a Delaunay Graph which is a model of `DelaunayGraph_2` concept.
|
||||
The class `Voronoi_diagram_2` provides an adaptor to view a triangulated Delaunay graph as their dual subdivision, the
|
||||
Voronoi diagram. 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`.
|
||||
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 V2 a model of the `AdaptationTraits_2` concept.
|
||||
\param av2 the voronoi diagram to draw.
|
||||
|
||||
|
|
|
|||
|
|
@ -493,8 +493,8 @@ location queries.
|
|||
A 2D Voronoi Diagram can be visualized by calling the \link PkgDrawVoronoiDiagram2 CGAL::draw<VD>() \endlink function as
|
||||
shown in the following example. This function opens a new window showing the Voronoi Diagram of the given input sites/vertex locations. 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`.
|
||||
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`.
|
||||
|
||||
\cgalExample{Voronoi_diagram_2/draw_voronoi_diagram_2.cpp}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue