mirror of https://github.com/CGAL/cgal
parent
c276b54e94
commit
873c3b26cf
|
|
@ -30,7 +30,7 @@ int main(int argc, char **argv)
|
|||
app.setOrganizationName("INRIA");
|
||||
app.setApplicationName("AABB tree demo");
|
||||
|
||||
// Import resources from libCGALQt (Qt5).
|
||||
// Import resources from libCGALQt (Qt6).
|
||||
CGAL_QT_INIT_RESOURCES;
|
||||
|
||||
MainWindow mainWindow;
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@ int main(int argc, char** argv)
|
|||
application.setOrganizationName("GeometryFactory");
|
||||
application.setApplicationName("Alpha Shape Reconstruction");
|
||||
|
||||
// Import resources from libCGALQt (Qt5).
|
||||
// See https://doc.qt.io/qt-5/qdir.html#Q_INIT_RESOURCE
|
||||
// Import resources from libCGAL_Qt6
|
||||
// See https://doc.qt.io/qt-6/qtresource-proxy.html#Q_INIT_RESOURCE
|
||||
|
||||
CGAL_QT_INIT_RESOURCES;
|
||||
Q_INIT_RESOURCE(Alpha_shape_3);
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ int main(int argc, char* argv[])
|
|||
QCoreApplication::setOrganizationName("CGAL");
|
||||
QCoreApplication::setApplicationName("2D Arrangements Demo");
|
||||
|
||||
// Import resources from libCGAL (Qt5).
|
||||
// Import resources from libCGAL (Qt6).
|
||||
CGAL_QT_INIT_RESOURCES;
|
||||
|
||||
ArrangementDemoWindow demoWindow;
|
||||
|
|
|
|||
|
|
@ -107,8 +107,8 @@ the location of third-party software during configuration.
|
|||
|
||||
Qt is a cross-platform application and UI framework.
|
||||
|
||||
The component libCGAL_Qt5 is essential to run the \cgal demos and basic viewers.
|
||||
It requires \qt5 installed on your system.
|
||||
The component libCGAL_Qt6 is essential to run the \cgal demos and basic viewers.
|
||||
It requires \qt6 installed on your system.
|
||||
In case \qt is not yet installed on your system, you can download
|
||||
it from <A HREF="https://www.qt-project.org/">`https://www.qt-project.org/`</A>.
|
||||
|
||||
|
|
|
|||
|
|
@ -171,9 +171,9 @@ In order to link against Qt5, you need to run:
|
|||
|
||||
brew link qt@5
|
||||
|
||||
After that, you will have to specify the Qt5_DIR by hand to cmake, using something like
|
||||
After that, you will have to specify the Qt6_DIR by hand to cmake, using something like
|
||||
|
||||
-DQt5_DIR=/usr/local/opt/qt5/lib/cmake/Qt5
|
||||
-DQt6_DIR=/usr/local/opt/qt6/lib/cmake/Qt6
|
||||
|
||||
where `/usr/local/` is actually your current brew installation directory. Check this directory
|
||||
to be sure where the Qt5 is placed on your machine.
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ configure and/or build. Their values can be ON or OFF.
|
|||
| `WITH_examples` | OFF |
|
||||
| `WITH_demos` | OFF |
|
||||
| `WITH_CGAL_Core` | ON |
|
||||
| `WITH_CGAL_Qt5` | ON |
|
||||
| `WITH_CGAL_Qt6` | ON |
|
||||
| `WITH_CGAL_ImageIO` | ON |
|
||||
|
||||
\subsection installation_flags Compiler and Linker Flags
|
||||
|
|
@ -181,7 +181,7 @@ Under Linux, the \gmpxx is also searched for, and you may specify the following
|
|||
\subsection installation_qt5 Qt5 Library
|
||||
|
||||
You must set the cmake or environment variable `Qt5_DIR` to point to the path
|
||||
to the directory containing the file `Qt5Config.cmake` created by your \qt5 installation. If you are
|
||||
to the directory containing the file `Qt6Config.cmake` created by your \qt6 installation. If you are
|
||||
using the open source edition it should be `<path>/qt-everywhere-opensource-src-<version>/qtbase/lib/cmake/Qt5`.
|
||||
|
||||
\subsection installation_leda LEDA Library
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ See the page
|
|||
| :-------- | :------------- | :------------ | :----------- |
|
||||
| \cgal | none | Main library | \gmp, \mpfr, \boost (headers) |
|
||||
| `CGAL_ImageIO` | `WITH_CGAL_ImageIO` | Utilities to read and write image files | \zlib, \vtk (optional) |
|
||||
| `CGAL_Qt5` | `WITH_CGAL_Qt5` | `QGraphicsView` support for \qt5-based demos | \qt5 |
|
||||
| `CGAL_Qt6` | `WITH_CGAL_Qt6` | `QGraphicsView` support for \qt6-based demos | \qt6 |
|
||||
|
||||
\subsection installation_examples CGAL Examples and Demos
|
||||
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ not depend on `Qt`. However, one of the examples in the Triangulation_2 package
|
|||
for visualization purposes. If you already have `Qt` installed, you can simply fill in the requested
|
||||
CMake variables and paths. Otherwise, you can also install it using `vcpkg`:
|
||||
|
||||
C:\dev\vcpkg> .\vcpkg.exe install qt5
|
||||
C:\dev\vcpkg> .\vcpkg.exe install qt6
|
||||
|
||||
Remember to specify `--triplet` or the related environment variable in case you target 64-bit applications.
|
||||
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ ALIASES = "cgal=%CGAL" \
|
|||
"gnu=GNU" \
|
||||
"ms=MS" \
|
||||
"qt=Qt" \
|
||||
"qt5=Qt5" \
|
||||
"qt6=Qt6" \
|
||||
"eigen=Eigen" \
|
||||
"opengr=OpenGR" \
|
||||
"libpointmatcher=libpointmatcher" \
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ ALIASES = "cgal=%CGAL" \
|
|||
"gnu=GNU" \
|
||||
"ms=MS" \
|
||||
"qt=Qt" \
|
||||
"qt5=Qt5" \
|
||||
"qt6=Qt6" \
|
||||
"eigen=Eigen" \
|
||||
"opengr=OpenGR" \
|
||||
"libpointmatcher=libpointmatcher" \
|
||||
|
|
|
|||
|
|
@ -311,7 +311,7 @@ int main(int argc, char **argv)
|
|||
app.setOrganizationName("GeometryFactory");
|
||||
app.setApplicationName("Alpha_shape_2 demo");
|
||||
|
||||
// Import resources from libCGAL (Qt5).
|
||||
// Import resources from libCGAL (Qt6).
|
||||
CGAL_QT_INIT_RESOURCES;
|
||||
|
||||
MainWindow mainWindow;
|
||||
|
|
|
|||
|
|
@ -313,7 +313,7 @@ int main(int argc, char **argv)
|
|||
app.setOrganizationName("GeometryFactory");
|
||||
app.setApplicationName("Apollonius_graph_2 demo");
|
||||
|
||||
// Import resources from libCGAL (Qt5).
|
||||
// Import resources from libCGAL (Qt6).
|
||||
// See https://doc.qt.io/qt-5/qdir.html#Q_INIT_RESOURCE
|
||||
CGAL_QT_INIT_RESOURCES;
|
||||
Q_INIT_RESOURCE(Apollonius_graph_2);
|
||||
|
|
|
|||
|
|
@ -573,7 +573,7 @@ int main(int argc, char **argv)
|
|||
app.setOrganizationName("GeometryFactory");
|
||||
app.setApplicationName("Bounding_volumes demo");
|
||||
|
||||
// Import resources from libCGAL (Qt5).
|
||||
// Import resources from libCGAL (Qt6).
|
||||
// See https://doc.qt.io/qt-5/qdir.html#Q_INIT_RESOURCE
|
||||
CGAL_QT_INIT_RESOURCES;
|
||||
|
||||
|
|
|
|||
|
|
@ -336,7 +336,7 @@ int main(int argc, char **argv)
|
|||
app.setOrganizationName("GeometryFactory");
|
||||
app.setApplicationName("Circular_kernel_2 demo");
|
||||
|
||||
// Import resources from libCGAL (Qt5).
|
||||
// Import resources from libCGAL (Qt6).
|
||||
CGAL_QT_INIT_RESOURCES;
|
||||
|
||||
MainWindow mainWindow;
|
||||
|
|
|
|||
|
|
@ -338,7 +338,7 @@ int main(int argc, char **argv)
|
|||
app.setOrganizationName("GeometryFactory");
|
||||
app.setApplicationName("Generator_2 demo");
|
||||
|
||||
// Import resources from libCGAL (Qt5).
|
||||
// Import resources from libCGAL (Qt6).
|
||||
// See https://doc.qt.io/qt-5/qdir.html#Q_INIT_RESOURCE
|
||||
CGAL_QT_INIT_RESOURCES;
|
||||
Q_INIT_RESOURCE(Generator_2);
|
||||
|
|
|
|||
|
|
@ -395,7 +395,7 @@ int main(int argc, char **argv)
|
|||
app.setOrganizationName("GeometryFactory");
|
||||
app.setApplicationName("L1 Voronoi diagram_2 demo");
|
||||
|
||||
// Import resources from libCGAL (Qt5).
|
||||
// Import resources from libCGAL (Qt6).
|
||||
CGAL_QT_INIT_RESOURCES;
|
||||
|
||||
MainWindow mainWindow;
|
||||
|
|
|
|||
|
|
@ -327,7 +327,7 @@ int main(int argc, char **argv)
|
|||
app.setOrganizationName("GeometryFactory");
|
||||
app.setApplicationName("Largest_empty_rectangle_2 demo");
|
||||
|
||||
// Import resources from libCGAL (Qt5).
|
||||
// Import resources from libCGAL (Qt6).
|
||||
// See https://doc.qt.io/qt-5/qdir.html#Q_INIT_RESOURCE
|
||||
CGAL_QT_INIT_RESOURCES;
|
||||
Q_INIT_RESOURCE(Largest_empty_rectangle_2);
|
||||
|
|
|
|||
|
|
@ -476,7 +476,7 @@ int main(int argc, char **argv)
|
|||
app.setOrganizationName("Nico Kruithof");
|
||||
app.setApplicationName("Periodic_2_Delaunay_triangulation_2 demo");
|
||||
|
||||
// Import resources from libCGAL (Qt5).
|
||||
// Import resources from libCGAL (Qt6).
|
||||
// See https://doc.qt.io/qt-5/qdir.html#Q_INIT_RESOURCE
|
||||
CGAL_QT_INIT_RESOURCES;
|
||||
|
||||
|
|
|
|||
|
|
@ -596,7 +596,7 @@ int main(int argc, char **argv)
|
|||
app.setOrganizationName("GeometryFactory");
|
||||
app.setApplicationName("Polygon_2 demo");
|
||||
|
||||
// Import resources from libCGAL (Qt5).
|
||||
// Import resources from libCGAL (Qt6).
|
||||
// See https://doc.qt.io/qt-5/qdir.html#Q_INIT_RESOURCE
|
||||
CGAL_QT_INIT_RESOURCES;
|
||||
Q_INIT_RESOURCE(Polygon_2);
|
||||
|
|
|
|||
|
|
@ -426,7 +426,7 @@ int main(int argc, char **argv)
|
|||
app.setOrganizationName("GeometryFactory");
|
||||
app.setApplicationName("Segment Voronoi 2 demo");
|
||||
|
||||
// Import resources from libCGAL (Qt5).
|
||||
// Import resources from libCGAL (Qt6).
|
||||
CGAL_QT_INIT_RESOURCES;
|
||||
|
||||
MainWindow mainWindow;
|
||||
|
|
|
|||
|
|
@ -341,7 +341,7 @@ int main(int argc, char **argv)
|
|||
app.setOrganizationName("GeometryFactory");
|
||||
app.setApplicationName("Snap_rounding_2 demo");
|
||||
|
||||
// Import resources from libCGAL (Qt5).
|
||||
// Import resources from libCGAL (Qt6).
|
||||
// See https://doc.qt.io/qt-5/qdir.html#Q_INIT_RESOURCE
|
||||
CGAL_QT_INIT_RESOURCES;
|
||||
Q_INIT_RESOURCE(Snap_rounding_2);
|
||||
|
|
|
|||
|
|
@ -302,7 +302,7 @@ int main(int argc, char **argv)
|
|||
app.setOrganizationName("GeometryFactory");
|
||||
app.setApplicationName("Spatial_searching_2 demo");
|
||||
|
||||
// Import resources from libCGAL (Qt5).
|
||||
// Import resources from libCGAL (Qt6).
|
||||
// See https://doc.qt.io/qt-5/qdir.html#Q_INIT_RESOURCE
|
||||
CGAL_QT_INIT_RESOURCES;
|
||||
Q_INIT_RESOURCE(Spatial_searching_2);
|
||||
|
|
|
|||
|
|
@ -279,7 +279,7 @@ int main(int argc, char **argv)
|
|||
app.setOrganizationName("GeometryFactory");
|
||||
app.setApplicationName("Stream_lines_2 demo");
|
||||
|
||||
// Import resources from libCGAL (Qt5).
|
||||
// Import resources from libCGAL (Qt6).
|
||||
// See https://doc.qt.io/qt-5/qdir.html#Q_INIT_RESOURCE
|
||||
CGAL_QT_INIT_RESOURCES;
|
||||
Q_INIT_RESOURCE(Stream_lines_2);
|
||||
|
|
|
|||
|
|
@ -923,7 +923,7 @@ int main(int argc, char **argv)
|
|||
app.setOrganizationName("GeometryFactory");
|
||||
app.setApplicationName("Constrained_Delaunay_triangulation_2 demo");
|
||||
|
||||
// Import resources from libCGAL (Qt5).
|
||||
// Import resources from libCGAL (Qt6).
|
||||
CGAL_QT_INIT_RESOURCES;
|
||||
|
||||
MainWindow mainWindow;
|
||||
|
|
|
|||
|
|
@ -412,7 +412,7 @@ int main(int argc, char **argv)
|
|||
app.setOrganizationName("GeometryFactory");
|
||||
app.setApplicationName("Delaunay_triangulation_2 demo");
|
||||
|
||||
// Import resources from libCGAL (QT5).
|
||||
// Import resources from libCGAL (Qt6).
|
||||
CGAL_QT_INIT_RESOURCES;
|
||||
|
||||
MainWindow mainWindow;
|
||||
|
|
|
|||
|
|
@ -334,7 +334,7 @@ int main(int argc, char **argv)
|
|||
app.setOrganizationName("GeometryFactory");
|
||||
app.setApplicationName("Regular_triangulation_2 demo");
|
||||
|
||||
// Import resources from libCGAL (Qt5).
|
||||
// Import resources from libCGAL (Qt6).
|
||||
CGAL_QT_INIT_RESOURCES;
|
||||
|
||||
MainWindow mainWindow;
|
||||
|
|
|
|||
|
|
@ -411,7 +411,7 @@ int main(int argc, char **argv)
|
|||
app.setOrganizationName("GeometryFactory");
|
||||
app.setApplicationName("Hyperbolic_Delaunay_triangulation_2 demo");
|
||||
|
||||
// Import resources from libCGAL (QT5).
|
||||
// Import resources from libCGAL (Qt6).
|
||||
CGAL_QT_INIT_RESOURCES;
|
||||
|
||||
MainWindow mainWindow;
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ int main(int argc, char** argv)
|
|||
application.setOrganizationName("INRIA");
|
||||
application.setApplicationName("3D Periodic Lloyd");
|
||||
|
||||
// Import resources from libCGAL (QT5).
|
||||
// Import resources from libCGAL (Qt6).
|
||||
// See https://doc.qt.io/qt-5/qdir.html#Q_INIT_RESOURCE
|
||||
CGAL_QT_INIT_RESOURCES;
|
||||
Q_INIT_RESOURCE(Periodic_Lloyd_3);
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ Polyhedron_demo::Polyhedron_demo(int& argc, char **argv,
|
|||
std::cout.precision(17);
|
||||
std::clog.precision(17);
|
||||
|
||||
// Import resources from libCGAL (Qt5).
|
||||
// Import resources from libCGAL (Qt6).
|
||||
CGAL_QT_INIT_RESOURCES;
|
||||
|
||||
this->setOrganizationDomain("geometryfactory.com");
|
||||
|
|
|
|||
Loading…
Reference in New Issue