dd3ed5b07c
Remove the "S" from HEADERS_ONLY
2016-03-09 10:58:55 +01:00
35a11c0e13
Use CGAL_HEADERS_ONLY everywhere
2016-03-09 10:56:11 +01:00
c27ff9e85c
Rename some cmake variables
2016-03-09 10:42:46 +01:00
78cde742ce
Work on demo with qt5; ok for AABBtree (but need to be improved)
2016-03-09 10:35:22 +01:00
ed2956eec2
Do not use qt5 module in header only mode
2016-03-09 10:31:17 +01:00
6d55c3b140
Do the target_link_libraries in all CGAL_XXX libraries only in non header only mode.
2016-03-09 10:22:43 +01:00
cf1c0ea0ca
Merge branch 'CGAL_headers_only-gdamiand_cjamin-OLD' into CGAL_headers_only-gdamiand_cjamin
2015-10-01 09:12:55 +02:00
986a7ae77b
Return early when missing dependencies
...
This saves parsing time, indentation depth, keeps messages local and
reduces code complexity.
2015-08-04 16:02:54 +02:00
57f97635c2
Report the exact missing dependencies
...
Build a variable with missing dependencies and use that to produce and
error message. Pretty printing could still be improved.
2015-08-04 16:01:35 +02:00
93fb88b499
Display Qt5 version in testsuite result pages
2015-08-03 13:09:44 +02:00
bc0c30bbfd
Better display of the Qt5 configuration
2015-07-15 15:53:52 +02:00
04db43556f
Do not warn when Qt5 is not found.
2015-07-13 15:55:41 +02:00
9550a41b67
Merge pull request #133 from bo0ts/Installation-add_exports-pmoeller
...
Add a CGALExports.cmake file
Conflicts:
GraphicsView/src/CGAL_Qt5/CMakeLists.txt
Installation/cmake/modules/CGALConfig_binary.cmake.in
Installation/cmake/modules/CGALConfig_install.cmake.in
There was also a conceptual conflict in:
Installation/src/CMakeLists.txt
2015-07-10 14:03:20 +02:00
59f7b09fae
Fix remaining CMake warnings about CMP0043
2015-07-08 17:08:35 +02:00
e199f546d4
remove QT4 specific code
2015-07-07 19:36:04 +02:00
33a1fdbcbc
Replace CGAL_LIBRARY with the actual CGAL target
...
The variable CGAL_LIBRARY is no longer defined within the build as it is
completely unnecessary and using the actual target allows more features.
2015-07-03 12:30:23 +02:00
6f075de186
AUTOMOC cannot be used for CGAL_Qt5
...
because of all_files.cpp
2015-03-31 11:50:06 +02:00
4c4598f612
Add destructor for DemosMainWindow (virtual class)
2015-03-31 11:49:08 +02:00
fa430e5fc0
WORK IN PROGRESS
2015-03-31 11:05:17 +02:00
8b3cca50a0
Modifying to Qt5
2015-03-31 10:22:21 +02:00
52dc3b265d
Merge remote-tracking branch 'remotes/cgal-public-dev/gsoc2014-CGAL-Qt5_support-vialon' into to-qt5
...
All CMake files modified by the branch 'gsoc2014-CGAL-Qt5_support-vialon' have been reset.
Conflicts:
GraphicsView/demo/Polygon/CMakeLists.txt
GraphicsView/src/CGAL_Qt4/CMakeLists.txt
GraphicsView/src/CGAL_Qt4/GraphicsView.qtmoc.cmake
Installation/cmake/modules/CGALConfig_binary.cmake.in
Installation/cmake/modules/CGALConfig_install.cmake.in
Installation/cmake/modules/CGAL_Macros.cmake
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
Linear_cell_complex/demo/Linear_cell_complex/MainWindow.cpp
Mesh_3/demo/Mesh_3/CMakeLists.txt
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Polyhedron_demo_edit_polyhedron_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_join_polyhedra_plugin.cpp
Polyhedron/demo/Polyhedron/Scene.cpp
Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt
Polyhedron/demo/Polyhedron/polyhedron_demo_macros.cmake
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/MainWindow.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_average_spacing_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_cleaning_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_inside_out_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_local_spacing_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_normal_estimation_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_off_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin_cgal_code.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_simplification_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_smoothing_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_xyz_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_plugin_helper.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene.cpp
Triangulation_3/demo/Triangulation_3/CMakeLists.txt
2015-03-30 16:02:51 +02:00
040458d248
Update of all the CMakeList and .cmake files for Qt5
...
Reasy for merging the cpp files from clone qt5
2015-03-30 15:34:17 +02:00
9c78897ba5
Merge branch 'CGAL_headers_only-gdamiand_cjamin-old' into CGAL_headers_only-gdamiand_cjamin
2015-03-16 14:00:43 +01:00
0f92048c4d
changes after Efi's review (and color changes in the demo)
2014-11-10 18:00:02 +01:00
a35858a293
Move exportSVG to the DemosMainWindow base class
2014-11-07 16:57:04 +01:00
941824738e
Header files for GraphicsView
2014-10-31 19:20:18 +01:00
7a0e8f545d
Bugs correction about STREQUAL into findQt5.
2014-08-05 10:05:15 -07:00
6df9530094
All GraphicView demonstrations ported to the new Qt inclusion way.
...
Change of Qt4or5 variables names.
Now: QT_VERSION => contains "QtX", with x 4 or 5 depending of the version wanted by the user.
USE_QT_VERSION => variable to force the version of Qt wanted. If this variable is set, the Qt Choice drop-down menu doesn't appear on CMake-gui.
QT_VERSION_USED => number of Qt version wanted (4 or 5).
QT4 => TRUE if Qt4 chosen.
QT5 => TRUE if Qt5 chosen.
2014-08-05 18:13:39 +02:00
0a457c4b03
Correction of some bug caused by the new find_package way of Qt (Qt4or5) with the Qt4 support.
2014-08-02 14:59:49 -07:00
46c8926854
New way to chose Qt version for projects configuration.
...
Now, we have choice between "WITH_CGAL_Qt4" and "WITH_CGAL_Qt5" (like before because differents CGAL_QtX sources folders return).
Once the libCGALQt4 or libCGALQt5 configured, an cmake config variable "CGAL_QT_RECENT" allow us to know what is the more recent libCGAL_QtX configured.
Automaticaly,the demonstrations chose this recent version of Qt to build their project (even if a Qt version choice is proposed during CMake configuration)
During CMake configuration, when the user change the version of libCGAL_QtX, that change automaticaly the Qt version of find_package(QtX)
Now Qt4or5 is the thing allowing the choice between Qt4 and Qt5 (find_package(CGAL COMPONENT Qt4or5) or find_package(Qt4or5))
2014-08-02 01:37:41 +02:00
6784800dd1
Fusion of CGAL_Qt4 and CGAL_Qt5 into just one CGAL_Qt.
2014-07-31 22:41:44 +02:00
548bba0637
Mesh_3_export_plugin Windows modification.
2014-07-17 19:16:18 +02:00
aee9e4eb24
Commit of new demonstrations porting.
2014-06-26 14:38:23 +02:00
08685b683e
Merge branch 'gsoc2014-CGAL-Qt5_support-vialon' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2014-CGAL-Qt5_support-vialon
...
Conflicts:
GraphicsView/src/CGAL_Qt5/CMakeLists.txt
GraphicsView/src/CGAL_Qt5/resources.cpp
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
2014-06-02 00:55:05 +02:00
5f09ccde1a
Compilation effective de la demonstration Linear Cell Complex. Commencement du portage de Triangulation_3.
2014-06-01 22:46:14 +02:00
1f669ad498
Update Support for Qt5 project.
2014-05-29 12:07:42 +02:00
7f3045ee11
Remove the use of CGAL_SVN_REVISION
...
src/CGAL_Qt4/DemosMainWindow.cpp was the sole user of the macro
CGAL_SVN_REVISIONS, in CGAL's master branch. That macro is useless since
the switch to Git.
2013-02-21 15:26:03 +01:00
e3cb421cd2
Fix: allow the drap&drop of a collection of files, and open all of them...
...
... instead of opening only the first one.
2012-09-27 13:29:40 +00:00
5f524b0802
subdirectories in src finally get correct name
2012-08-03 17:21:30 +00:00
8e167590c8
Use include_directories(SYSTEM ...) for 3rd-party libraries
...
gcc has an option -isystem, that can replace -I. The documentation is:
-isystem dir
Search dir for header files, after all directories specified by -I but
before the standard system directories. Mark it as a system directory,
so that it gets the same special treatment as is applied to the
standard system directories. If dir begins with "=", then the "=" will
be replaced by the sysroot prefix; see --sysroot and -isysroot.
The "special treatment" means that gcc will not warn about constructions in
headers in directories pointed by -isystem instead of -I.
In the CGAL testsuite, there are a lot of warnings that comes from
third-party libraries (mostly from Boost, but also from Eigen).
This patch tells cmake to use -isystem with gcc, for all CGAL 3rd-party
directories.
2012-08-01 10:53:37 +00:00
bc6d9c1005
fixed typo: added missing '_'
2012-07-03 10:53:25 +00:00
d4cb1c2212
SetupDependicies needs also to check for essential lib (not just WITH_<lib>), side effect: mandatory->essential
2012-06-29 15:24:30 +00:00
947dd14f31
Minor fix: ensure the OpenGL version is displayed by test results pages
2012-06-29 10:57:59 +00:00
b5a4e941fd
the mandatory libs need an particular order, and we simplify with a macro
2012-06-29 09:24:19 +00:00
70e00b3d6e
First fix for Windows: the auto-linking needs link_directories commands
2012-06-28 15:32:04 +00:00
eb6c435c4a
correct spelling of GMPXX_FOUND variable
...
FOUND_GMPXX -> GMPXX_FOUND
2012-06-28 13:02:32 +00:00
df72a1aa08
macro use_lib now has an optional second parameter for UseFile
...
this avoids a nasty hack with checking for a leading ### in a string and
allows to use "use_lib( FOO )" in other places much easier
2012-06-28 12:20:52 +00:00
67291a2c6d
merge from next
2012-06-24 12:17:32 +00:00
ea6635c86d
Include the header with the declaration so that the declaration with
...
the attribute precedes the definition.
2012-06-20 10:20:27 +00:00
7b2e34d267
merge with next
2012-01-27 16:46:42 +00:00
Clement Jamin
Guillaume Damiand
Philipp Möller
Laurent Rineau
Sébastien Loriot
Maxime Gimeno
Andreas Fabri
Aurélien Vialon
Laurent Rineau
Eric Berberich
Philipp Möller