1016c43195
Fix detection of Boost.Thread vs. C++11
...
This allows to build CGAL non-header-only with C++11, and then use C++03 is
a user-project: the need for Boost.Thread is reevaluated.
2017-12-19 15:56:30 +01:00
02d7260dc1
Store the detection of C++11 in a CMake global property
...
That avoids to re-detecting it again and again.
2017-12-19 15:56:02 +01:00
e80136e750
Merge branch 'master' into Aos_2-surface_sweep-efif
2017-12-07 15:00:47 +01:00
f1483cfa25
Merge branch 'Aos_2-surface_sweep-efif-old' into Aos_2-surface_sweep-efif
...
Merging Sebastien's fix to the surface-sweep cod.
Also, replaced all occurrences of '_SL_' with '_SS_'.
2017-12-07 15:56:00 +02:00
163a90b6c1
Fix `make install` in header-only
...
Now the Qt5 resources (qrc files, icons) are installed along with the
CMake modules.
2017-12-07 11:34:00 +01:00
777717ba7e
Move config/ to cmake/modules/config/
...
That way, the directory will be installed along with CMake modules.
2017-12-06 12:53:05 +01:00
4343b756f0
Merge pull request #2636 from maxGimeno/Add_make_install_tests-GF
...
Test make install in travis
# Conflicts:
# Installation/cmake/modules/CGAL_Macros.cmake
2017-12-05 18:25:59 +01:00
3c6640bf59
Merge pull request #1436 from lrineau/CGAL-new_cmake-GF
...
Renewal of CMake scripts: header-only, ctest, CMake>=3.1
# Conflicts:
# Installation/config/testfiles/CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp
2017-12-05 18:20:05 +01:00
477b12dd83
Hack for the CGAL test suite (cont.)
...
Follow-up to:
> commit 249aed9fd1
2017-11-30 11:15:38 +01:00
5c7958dc08
Improve CGAL_target_use_TBB
...
The use of TBB by a target is private.
2017-11-30 11:12:11 +01:00
ea95e2b2eb
CGALConfig.cmake changes the CMAKE_MODULE_PATH
...
Maybe a temnporary "solution".
Laurent Rineau
2017-11-30 10:07:53 +00:00
a2c513f080
QGLviewer depends on the lib GLU
2017-11-29 11:17:31 +01:00
6ec4c12031
Do not use OpenGL directly, but only using Qt5 OpenGL classes
2017-11-28 17:58:12 +01:00
4267df0a78
Fix get_dependency_version(..) when CGAL is installed
...
.. That is not really a fix, but any I plan to remove that code soon or
later!
2017-11-28 14:13:31 +01:00
0f63e872c1
Fix when Qt5 is not found
2017-11-28 10:28:50 +01:00
d44f144a90
Restore the missing file
2017-11-27 10:18:42 +01:00
249aed9fd1
Hack for the CGAL test suite
2017-11-23 17:06:47 +01:00
ce9399d423
Display compiler and linker flags
2017-11-23 17:06:46 +01:00
9eb2e30745
Deal with the macro CGAL_TEST_SUITE in header-only
2017-11-23 17:06:46 +01:00
a2a5ca91a1
Unify CGAL_HEADER_ONLY and CGAL_HEADER_ONLY_STEP_2
2017-11-23 17:06:46 +01:00
c0ad644269
Correct syntax for target_compile_definitions
2017-11-23 16:41:21 +01:00
876e4f8321
Rename CGAL_Qt5_extras to CGAL_Qt5_moc_and_resources
2017-11-22 13:01:06 +01:00
19c5502ca8
Fix compilation of demos in non-header-only
...
Now the variables `CGAL_Qt5_MOC_FILES` and `CGAL_Qt5_RESOURCE_FILES` are no
longer used by the definition of `CGAL_Qt5_extras`: other names are used.
`CGAL_Qt5_extras` is not supposed to be used directly by
users/examples/demos' `CMakeLists.txt`.
2017-11-22 12:45:21 +01:00
18caaba64d
Fix the "-fp-model strict" for Intel
...
`-fp-model strict` is two arguments, not one!
```
[ 4%] Building CXX object src/CGAL/CMakeFiles/CGAL.dir/all_files.cpp.o
cd /home/cgal_tester/build/src/cmake/platforms/CentOS7-ICC-2016-Release/src/CGAL && /opt/intel/compilers_and_libraries_2016.4.258/linux/bin/intel64/icpc -DCGAL_EXPORTS -I/home/cgal_tester/build/src/cmake/platforms/CentOS7-ICC-2016-Release/include -I/mnt/testsuite/include -w1 -O3 -DCGAL_NDEBUG -fPIC "-fp-model strict" -o CMakeFiles/CGAL.dir/all_files.cpp.o -c /home/cgal_tester/build/src/cmake/platforms/CentOS7-ICC-2016-Release/src/CGAL/all_files.cpp
icpc: command line warning #10159 : invalid argument for option '-fp-model'
```
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-4.12-Ic-97/Installation/TestReport_lrineau_CentOS7-ICC-2016-Release.gz
2017-11-21 13:51:24 +01:00
fe139a8a7a
Fix a typo
2017-11-21 09:51:55 +01:00
9c350f2c47
Fix CMake errors in CGAL demos, with CMake<3.4
2017-11-20 10:41:44 +01:00
cf6522dba6
Fix CMake error on Windows about Boost.Thread and CGAL_Core
2017-11-20 10:40:45 +01:00
891a83840e
Merge branch 'CMake-parse_CTest_XML_output-lrineau' into CGAL-new_cmake-GF
2017-11-17 15:03:57 +01:00
8a260c4c32
Remove CGAL setup flags
...
@afabri This commit removes our tricks with the compilation flags.
2017-11-17 12:57:12 +01:00
1dd41508fe
Fix the syntax error with CMake<=3.3
2017-11-17 11:33:56 +01:00
0c5ffa9968
Fix Boost usage on Windows
2017-11-17 11:06:32 +01:00
21dabf1b1b
Add compilation tests for demos
2017-11-16 18:45:33 +01:00
bbee705221
Add compilation tests for demos
2017-11-16 18:38:15 +01:00
7936109c6c
Merge branch 'Aos_2-surface_sweep-efif-old' into Aos_2-surface_sweep-efif
...
Conflicts:
.travis.yml
.travis/packages.txt
Arrangement_on_surface_2/include/CGAL/Arr_batched_point_location.h
Arrangement_on_surface_2/include/CGAL/Arr_bounded_planar_topology_traits_2.h
Arrangement_on_surface_2/include/CGAL/Arr_default_overlay_traits.h
Arrangement_on_surface_2/include/CGAL/Arr_overlay_2.h
Arrangement_on_surface_2/include/CGAL/Arr_spherical_topology_traits_2.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_batched_pl_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_construction_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_insertion_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_overlay_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_topology_traits_2_impl.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_vert_decomp_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_planar_topology_traits_base_2.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_batched_pl_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_construction_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_insertion_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_overlay_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_vert_decomp_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_batched_pl_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_construction_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_insertion_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_overlay_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_topology_traits_2_impl.h
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_vert_decomp_helper.h
Arrangement_on_surface_2/include/CGAL/Arr_unb_planar_topology_traits_2.h
Arrangement_on_surface_2/include/CGAL/Arr_vertical_decomposition_2.h
Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_default_planar_topology.h
Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h
Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_impl.h
Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_basic_insertion_traits_2.h
Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_batched_pl_ss_visitor.h
Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_construction_ss_visitor.h
Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_default_overlay_traits_base.h
Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_insertion_traits_2.h
Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_no_intersection_insertion_ss_visitor.h
Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_overlay_ss_visitor.h
Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_overlay_subcurve.h
Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_overlay_traits_2.h
Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_vert_decomp_ss_visitor.h
Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_meta_traits.h
Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op.h
Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_sweep.h
Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_visitor.h
Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_polygon_simplifier.h
Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_polygon_validation.h
CGAL_ipelets/demo/CGAL_ipelets/arrangement.cpp
Documentation/doc/Documentation/dependencies
Installation/include/CGAL/config.h
Snap_rounding_2/include/CGAL/Snap_rounding_2.h
Surface_sweep_2/examples/Surface_sweep_2/CMakeLists.txt
Surface_sweep_2/include/CGAL/Surface_sweep_2/No_intersection_surface_sweep_2_impl.h
Surface_sweep_2/include/CGAL/Surface_sweep_2/No_overlap_event_base.h
Surface_sweep_2/include/CGAL/Surface_sweep_2/Surface_sweep_2_utils.h
Surface_sweep_2/include/CGAL/Surface_sweep_2_algorithms.h
Sweep_line_2/include/CGAL/Sweep_line_2/Arr_construction_event.h
Sweep_line_2/include/CGAL/Sweep_line_2/Arr_construction_subcurve.h
Sweep_line_2/include/CGAL/Sweep_line_2/Arr_insertion_sl_visitor.h
Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_2_visitors.h
Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_curve_pair.h
Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_functors.h
Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_subcurve.h
Sweep_line_2/include/CGAL/Sweep_line_empty_visitor.h
2017-11-16 16:31:52 +02:00
6804eadd98
Fill the CMAKE_CONFIGURE_DEPENDS directory property
...
... with each `.cin` and `.cmd` files that are used.
2017-11-15 18:55:25 +01:00
6aae344f9c
Enable CTest from sub-directories of CGAL
2017-11-15 18:43:44 +01:00
ffe500eb29
Remove the deprecation warning, for now.
2017-11-15 17:29:45 +01:00
0681ac6dbc
Fix the TBB_USE_FILE warnings
2017-11-15 17:00:02 +01:00
a9365554c9
Merge pull request #2550 from sloriot/CGAL-add_SPDX_tags
...
Add SPDX License Identifier
2017-11-15 16:48:27 +01:00
489e1b2ae1
Remove debug message
2017-11-15 14:47:34 +01:00
3f3f5b1a52
Do not rely on CMAKE_MODULE_PATH
2017-11-15 14:45:12 +01:00
fe24a4db68
Explicit the dependencies of QGLViewer
2017-11-14 14:08:55 +01:00
1d63eeb5dc
Add support for testing on Android
2017-11-14 10:39:35 +01:00
264c23294f
Ease the cross-compilation
2017-11-14 10:38:51 +01:00
283f8138d8
CGAL_Core needs Boost.Thread
2017-11-13 14:41:03 +01:00
03f84dc94b
Handle the compiler flags
...
That setup was previously in `Installation/CMakeLists.txt`.
2017-11-13 14:28:51 +01:00
8c44bceedd
Fix a typo
2017-11-13 13:51:23 +01:00
838217a153
CGAL_CURRENT_SOURCE_DIR is no longer used/filled
2017-11-13 11:49:07 +01:00
c6068691fa
Merge pull request #2547 from lrineau/CMake-parse_CTest_XML_output-lrineau
...
CGAL testsuite implemented with CTest plus Python (part.1)
2017-11-13 11:13:54 +01:00
0698f79aff
add SPDX identifier for files under the LGPL-3+ license
2017-11-12 10:17:50 +01:00
260c4dac61
Fix the API of cgal_add_test
2017-11-03 15:05:35 +01:00
252eb66dc2
Split cgal_add_test further, with the new cgal_setup_test_properties
2017-11-03 11:13:49 +01:00
855d995e1e
Improvements
...
- split `cgal_add_test()` into `cgal_add_test()` and
`cgal_add_compilation_test()`
- `cgal_add_test()` have more parameters:
- an optional custom `TEST_NAME`,
- extra arguments to use for the test.
- Add CTest support for `test/Sweep_line_2/`
2017-11-03 09:34:55 +01:00
633374027b
Do not run a test if the compilation failed
...
The test binary may have been compiled in a previous compilation.
But if the current compilation failed, do not run the test.
2017-10-26 19:50:40 +02:00
6c24ed92e5
Deal with comments (`#`) in test/Set_movable_separability_2/*.cmd
2017-10-24 11:46:40 +02:00
1fbdd79363
Avoid adding the same test twice
2017-10-23 16:10:06 +02:00
45d60917e4
Use CMake 3.7 fixtures, to execute in a dedicated directory
2017-10-20 17:02:32 +02:00
e73c95d4cd
Do not test demos
2017-10-20 17:01:43 +02:00
9a127c6f5d
Add CMake option CGAL_CTEST_DISPLAY_MEM_AND_TIME
...
"Display memory and real time usage at end of CTest test outputs"
2017-10-20 10:26:11 +02:00
a63cfa9612
Parse the XML file Test.xml from `ctest -D`
...
... eventually, that will help move from our testsuite scripts to
CTest testsuite, plus CDash.
2017-10-20 00:15:04 +02:00
63f5286372
Merge pull request #2375 from sloriot/Cmake-remove_FindCGAL
...
Remove files no longer needed since CGAL uses the config mode of cmake
2017-08-28 12:49:55 +02:00
a3cbacd968
remove files no longer needed since CGAL uses the config mode of cmake
2017-08-25 17:00:22 +02:00
b88deb3759
Rename Efficient_RANSAC_traits as Shape_detection_traits (same for concept)
2017-08-01 15:45:06 +02:00
fb458b9506
Whitelist also the (read|write)_ply_points.h
2017-07-11 11:58:53 +02:00
2d286d5e79
Add the files to the whitelist
2017-07-11 11:58:53 +02:00
8aed657e64
Check for LASLIB_INCLUDE_DIR to make sure LASlib is found
2017-07-11 11:58:52 +02:00
4e2982c15a
add hints to find LASlib (helps on windows)
2017-07-11 11:58:52 +02:00
bd94c3005b
Move USE_AS_DLL as a temporary definition around LASlib header
2017-07-11 11:58:52 +02:00
55c1972c22
add macro USE_AS_DLL to decl import
2017-07-11 11:58:52 +02:00
1a53899c4b
Correct FindLASLIB with CGAL fork of LASLIB
2017-07-11 11:58:50 +02:00
9a77eef553
Unify cmake behavior with LASlib
2017-07-11 11:58:50 +02:00
f4fea04a4d
Add definition CGAL_LINKED_WITH_LASLIB
2017-07-11 11:58:48 +02:00
a79d7be088
New example for LAS reader
2017-07-11 11:58:47 +02:00
c4438a472b
Merge branch 'master' into Aos_2-surface_sweep-efif
2017-07-05 15:39:09 +02:00
981d271774
Merge pull request #2181 from gdamiand/patch-1
...
Update CGAL_SetupFlags.cmake
2017-06-30 16:52:07 +02:00
f860f8c2c7
Replaced pointer to licence with licence itself
2017-06-22 16:17:13 +02:00
b432ff351b
Fixed permissions
2017-06-22 16:15:57 +02:00
602e6b456f
find_package SuiteSparse
2017-06-22 16:15:57 +02:00
f6d87bc3a5
Merge pull request #2172 from Geopipe/usecgalspam
...
Flag to prevent blanking linking flags from being applied
2017-06-21 14:44:40 +02:00
2a5dfb149a
Update CGAL_SetupFlags.cmake
...
Allows to use the 4 possible built types Release, Debug, RelWithDebInfo or MinSizeRel.
(see https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html )
2017-06-15 19:03:06 +02:00
c25e4997ef
Fix the indentation
2017-06-15 17:38:34 +02:00
0d13f433f7
flag to prevent blanking linking flags from being applied
2017-06-13 19:03:16 -04:00
b4f3d79b9b
Make CTest build the targets
2017-06-09 16:50:06 +02:00
3e6de6b439
Renamed sweep-line to surface-sweep and cleaned up
2017-05-27 12:30:41 +03:00
4d6149647d
<CGAL/CGAL_Ipelet_base.h> requires C++11, skip it
...
That header needs C++11 at least, and that does not play well with the
`check_headers` feature. So put it in the whitelist, so that it is not
tested along with the other headers.
2017-04-18 18:25:56 +02:00
a0155a70ed
Add Sphinx documentation
...
The `Makefile` can be used to generate the documentation:
make html
`sphinx-build` must be in the path.
2017-03-27 18:04:55 +02:00
97352da979
Fix CGAL_Core and CGAL_HEADERS_ONLY_STEP_2
2017-03-27 18:04:55 +02:00
7c97443e37
Add a backward compatibility
...
A few CMakeLists.txt modify `CGAL_3RD_PARTY_LIBRARIES` to add Boost or
TBB libraries to it. In this case, emit a `DEPRECATION` warning and do
link with `${CGAL_3RD_PARTY_LIBRARIES}`.
2017-03-27 18:04:54 +02:00
af38caef16
Better CMake API for TBB
...
- new CMake module `CGAL_target_use_TBB` that defines a function, that
enables TBB per target.
- `UseTBB.cmake` is deprecated.
2017-03-27 18:04:54 +02:00
eb5f52869f
Use the new API of target_link_libraries
...
... otherwise CMake warns about mixing old and new usages of that CMake
command.
2017-03-27 18:04:54 +02:00
a0c0227f7d
Remove display messages
...
Anyway that lead to a bug when Qt5 was not found.
2017-03-27 18:04:53 +02:00
7c18b22b4c
Fix CGAL_TweakFindBoost
...
That module was using the useless macros `cache_set` and
`add_to_cached_list`.
2017-03-27 18:04:53 +02:00
fa0d681c23
Simplify and fix CGALConfig.cmake for header-only2
2017-03-27 18:04:53 +02:00
98156dc1a7
CGAL_Setup${cgal_lib}CoreDependencies improve
...
- Now even CGAL_Core has one.
- The `${cgal_lib}_FOUND` are now set in those modules, after having chec
- For self-consistency, `Use_CGAL_Qt5_headers` is included by
`CGAL_SetupCGAL_Qt5Dependencies`.
2017-03-27 18:04:52 +02:00
9c96205a38
First prototype of a pure CGAL_HEADER_ONLY
...
That is the step 2 of the header-only effort.
Still to do:
- make it work with `make install`
- ensure that `CGAL_Core` is correctly handled with `CGAL_DISABLE_GMP`
2017-03-27 18:04:41 +02:00
908bb2dc01
Fix Use_CGAL_Qt5_headers.cmake
...
Outside a build with `WITH_demos=TRUE`, that was probably buggy.
2017-03-27 17:23:27 +02:00
9902457b0a
Make CGAL_SCM.cmake define a function
...
... instead of launching the code. That will help launch it on other
directories.
2017-03-27 17:23:27 +02:00
255c09f03b
Simplify CGALConfig_binary.cmake.in
2017-03-27 17:23:27 +02:00
2daba815b3
New way to use the CGAL_Qt5 extra files
2017-03-27 17:23:27 +02:00
6af02862de
This comment is not true anymore
2017-03-27 17:23:27 +02:00
e209c57269
Add -DCGAL_HEADER_ONLY when relevant
2017-03-27 17:23:27 +02:00
fade4c0eb4
Fix CGAL_HEADER_ONLY
2017-03-27 17:23:27 +02:00
98890c9924
Fix the INTERFACE_INCLUDE_DIRECTORIES of CGAL
2017-03-27 17:23:27 +02:00
23a1c3ee54
Revert "This only has to be done in header-only mode"
...
This reverts commit ff3b3b01ab96485cd32564175833b68044806bee.
2017-03-27 17:23:27 +02:00
6f0efd931f
Remove useless test
2017-03-27 17:23:26 +02:00
5d5f6d4dae
include CGAL_Macros.cmake in the CGALConfig.cmake
2017-03-27 17:23:26 +02:00
dfb24b5340
Add comments
2017-03-27 17:23:26 +02:00
b9909ddfb5
This only has to be done in header-only mode
2017-03-27 17:23:26 +02:00
a3ddaa132f
Define and use a new CMake API for CGAL
...
For the moment, the new API is used only in:
- `examples/Mesh_2/CMakeLists.txt`
- `demo/Triangulation_2/CMakeLists.txt`
2017-03-27 17:23:26 +02:00
973b4e89b2
Fix bug in case ZLib is not found
2017-03-27 17:23:26 +02:00
a2a3ad29b4
Use CGAL_SetupCGAL_Qt5Dependencies + remove useless test
2017-03-27 17:23:26 +02:00
c2fd460927
Use CGAL::CGAL_<lib> instead of CGAL_<lib>
2017-03-27 17:23:26 +02:00
f9835007e5
Use CGAL::CGAL instead of CGAL
2017-03-27 17:23:26 +02:00
8f2fa4f637
Do not hardcode CGAL_Qt5
...
Use ${target} instead.
2017-03-27 17:23:26 +02:00
429bfa4315
move the add_config_flag calls
2017-03-27 17:23:26 +02:00
ff15d0e5fc
Simplify the CMakeLists.txt of our libraries
2017-03-27 17:23:26 +02:00
b978620b29
Add an include guard
2017-03-27 17:13:15 +02:00
d87cfd9ed5
CMake: If MSVC/C++11, do not search for Boost.Thread for CGAL_Core
...
See for example that error, on a Windows platform that does not have any
compiled Boost libraries.
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-4.10-Ic-121/Polygon_Demo/TestReport_afabri_x64_Cygwin-Windows10_MSVC2017-Debug-64bits.gz
2017-02-09 12:46:36 +01:00
b73a88babc
CGAL_Core MemoryPool<T> will always use Boost.Thread with g++
...
Because of bug in gcc, even if the C++11 `thread_local` keyword can be
used, it cannot be used for the TLS static member of the class template
`MemoryPool<T>`. That triggers a bug in gcc (tested with g++ 6.3.1):
```
.../include/CGAL/CORE/MemoryPool.h:113:25: error: redefinition of 'bool __tls_guard'
MemoryPool<T, nObjects> MemoryPool<T, nObjects>::memPool;
^~~~~~~~~~~~~~~~~~~~~~~
.../include/CGAL/CORE/MemoryPool.h:113:25: note: 'bool __tls_guard' previously declared here
.../include/CGAL/CORE/MemoryPool.h:113: confused by earlier errors, bailing out
Preprocessed source stored into /tmp/cc4xCWuR.out file, please attach this to your bugreport.
```
The bug seems to be from g++ >= 5:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54948
2017-02-08 17:05:13 +01:00
a89ccb10e7
remove non UTF-8 characters
2017-01-19 15:20:26 +01:00
722e37c4d7
MPIR support
2016-12-23 22:32:32 +01:00
204f9d080a
Merge remote-tracking branch 'cgal/releases/CGAL-4.9-branch'
2016-12-05 12:19:36 +01:00
f99b898cdf
Use LEDA linker flags
2016-12-02 10:57:18 +01:00
205bc84874
Fix FindLEDA with clang
2016-11-30 10:40:04 +01:00
5b3c44a3ef
Merge pull request #1637 from sloriot/CGAL-fix_install_prefix
...
Add a hardcoded fall back for the installation prefix
2016-11-03 11:03:24 +01:00
f674cc1cd1
add a hardcoded fall back for the installation prefix
...
in case of no common setting, the installation cannot be
relocated automatically
2016-10-31 15:52:11 +01:00
2c4e047f58
Do not early exit if IPE_FULL_VERSION is not there
...
If `IPE_FULL_VERSION` is missing, that leads to a CMake error in
`CMakeLists.txt` files using it.
2016-10-25 11:17:10 +02:00
0d5ddad5c3
Merge pull request #1534 from lrineau/CGAL-Allow_examples_to_use_cpp11_features-lrineau
...
Allow examples to use C++>=11 features
2016-10-17 10:03:05 +02:00
54ce89f314
Merge pull request #1560 from lrineau/Installation-fix_CGAL_VERSION_issue_1559-lrineau
...
Fix CGAL_VERSION in CGALConfig.cmake
2016-10-17 10:01:11 +02:00
e5b441feaa
Fix CGAL_VERSION in CGALConfig.cmake
2016-10-10 12:31:21 +02:00
451577719c
Merge pull request #1542 from lrineau/Installation-fix_CGAL_SetupBoostlrineau
...
try_run to detect the C++ version
2016-10-07 14:38:22 +02:00
223c1cf5a4
Merge pull request #1530 from lrineau/Installation-compute_dependencies-GF
...
Compute and fix packages dependencies
2016-10-05 13:11:04 +02:00
e8dede494e
Avoir a CMake error
...
When the list `CMAKE_CXX_COMPILE_FEATURES` is empty, there was a syntax
error.
```
CMake Error at /mnt/testsuite/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake:27 (list):
list sub-command REMOVE_ITEM requires two or more arguments.
Call Stack (most recent call first):
CMakeLists.txt:75 (create_single_source_cgal_program)
```
2016-10-05 10:07:01 +02:00
c1b070dd51
Use try_run to detect the C++ version
2016-10-04 16:57:19 +02:00
87a2248ab6
Do no test demos
...
New directory property named `CGAL_NO_TESTING`. If set to `TRUE`, then
the automatic generating of CTest test will be disabled.
(cherry picked from commit 5d540fc1989c86438090b0212883b15cd121cf92)
2016-09-30 19:58:56 +02:00
038207bc15
Fix CTest
...
I broke the support for .cmd files in 3d36fe05b3
2016-09-30 19:46:58 +02:00
50d753350e
Allow examples to use C++>=11 features
...
The macro `create_single_source_cgal_program` from
`CGAL_CreateSingleSourceCGALProgram` has been modified accordingly.
(cherry picked from commit 571659aaa32a30d7bfc0ce54a9d29c56079dca06)
2016-09-30 18:42:46 +02:00
bc03fae86c
Add a whitelist
...
For now, `<CGAL/Linear_cell_complex_constructors.h>` is skipped.
2016-09-30 15:23:15 +02:00
367da380f1
Move and regenerate list_of_documented_headers.cmake
2016-09-30 15:23:15 +02:00
67e9da4770
FindIPE defines IPE_VERSION
2016-09-30 15:23:14 +02:00
b700a3f4da
Fix a bug in the deps detection
2016-09-30 15:23:14 +02:00
ceb6961594
Remove a debug message
2016-09-30 15:22:28 +02:00
ed680537c9
WIP: compute packages dependencies, using the compiler
2016-09-30 15:22:26 +02:00
4707b2ed29
Merge pull request #1443 from TManhente/master
...
Adds CMake package version file generation
2016-09-23 16:52:13 +02:00
d8b564e003
Use CGAL_add_test.cmake
2016-09-20 10:53:20 +02:00
3d36fe05b3
WIP: the Arr_2 testsuite is now working!!
2016-09-20 10:53:20 +02:00
c0f36af442
Add a comment
2016-09-20 10:53:20 +02:00
0a88180b51
Handle the case when a glob pattern is in .cmd
...
In that case, CMake must use globbing to interpret the content of the
.cmd file.
2016-09-20 10:53:20 +02:00
545e80f18e
Add a variable CGAL_CURRENT_SOURCE_DIR
...
Save the current source directory to `CGAL_CURRENT_SOURCE_DIR`. The
variable value is modified by a `CMakeLists.txt` file when it is
generated by `cgal_create_cmake_script` in the binary tree. The script
`cgal_create_cmake_script` itself it called by CMake, by the function
`process_CGAL_subdirectory` (see its definition in
`Installation/cmake/modules/CGAL_Macros.cmake`), called in
`(examples|test|demo)/CMakeLists.txt`.
Eventually, that variable value is supposed to be the directory to the
current sources, even if the current `CMakeLists.txt` is within the
binary tree.
That is used in `CGAL_CreateSingleSourceCGALProgram.cmake` for the CTest
support, so set correctly the current working directory (in the
directory of the tests/examples).
2016-09-20 10:53:20 +02:00
c30560143b
Correctly handle `.cmd` files
...
The trick to use the CMake command `separate_arguments` to interpret the
lines of the `.cmd` file.
2016-09-20 10:53:20 +02:00
269feff7e1
Handle .cin files correctly, with a CMake script in process mode
...
Handle also multi-line `.cmd` files.
2016-09-20 10:53:20 +02:00
da84b03941
better handling with cmake 3.4 and greater
2016-09-13 16:38:07 +02:00
ca8cfba5ad
-ansi implies c++98 -> update script requirements of boost libraries
2016-09-13 14:22:49 +02:00
6cfa204b29
Fixes the version compatibility to `SameMajorVersion`
...
See: https://github.com/CGAL/cgal/pull/1443#discussion-diff-78162752
2016-09-09 08:32:30 -03:00
9c338ad61a
Removes the copy of the package version file to the build config folder
...
See: https://github.com/CGAL/cgal/pull/1443#discussion-diff-78147435
2016-09-09 08:32:21 -03:00
a24dd7dd1c
Adds CMake package version file generation
...
This allows clients to specify a minimum CGAL version in their CMake list files.
Eg.:
find_package(CGAL 4.9)
More info: https://cmake.org/cmake/help/v3.6/manual/cmake-packages.7.html#package-version-file
2016-09-08 21:14:20 -03:00
2cd9a15bb9
Merge remote-tracking branch 'cgal/releases/CGAL-4.8-branch'
...
Merge the following merge commits:
> 12b92f5#1271 from lrineau/Mesh_3-distance_criterion_sizing_field-GF
> 9c3d0b0#1295 from lrineau/CGAL-add_test-GF
Conflicts:
Maintenance/release_building/BUGFIX_NUMBER
Maintenance/release_building/public_release_name
2016-07-22 18:31:02 +02:00
3ff72add4a
Add a comment with a TODO
2016-07-21 16:34:42 +02:00
1da7e81b55
Add the project name to the LABELS property
2016-07-21 15:44:30 +02:00
c65d3abe17
Add support for CTest
2016-07-21 14:42:35 +02:00
b2c9d14937
Merge pull request #1178 from cjamin/patch-2
...
Add TBB support for MSVC14
2016-07-20 18:08:27 +02:00
1cde972cdb
Remove whitespace at end of lines
2016-06-29 11:04:29 +02:00
7717bc83b4
ImageIo does not need opengl nor vtk
2016-06-28 11:29:51 +02:00
157f2507cf
Re-add find_package(Qt5 QUIET COMPONENTS OpenGL Svg) and find_package(OpenGL QUIET) in CGALConfig; they are required in header only mode
2016-06-24 18:58:44 +02:00
c4758f091a
Simplify CGALConfig files: we do not need anymore to find zlib, nor opengl.
2016-06-24 14:38:28 +02:00
e21ef313c0
Merge branch 'CGAL_headers_only_step1-gdamiand_cjamin-old' into CGAL_headers_only_step1-gdamiand_cjamin
2016-06-22 20:54:37 +02:00
50125f1d53
First try to use an interface target in header only; in order to allow to link with this fictive target.
2016-06-22 13:44:50 +02:00
f6428de32c
include only .cmake file when they exist.
2016-06-21 19:08:06 +02:00
276c8271ab
Remove a debug message
2016-06-21 12:27:44 +02:00
1f40288aa3
Update cmakes in order to deal with install version of CGAL in header only mode.
2016-06-21 11:20:28 +02:00
0b8115daff
Make CGAL installation relocable
2016-06-16 11:11:46 +02:00
b175d15421
Simplify test
2016-06-15 11:49:58 +02:00
c1fe6fb342
Add TBB support for MSVC14
...
TBB now supports MSVC 2015 (= VC14)
https://software.intel.com/en-us/articles/whats-new-intel-threading-building-blocks-44-update-1
2016-06-15 11:03:58 +02:00
561bd80d96
On Windows, OPENGL_INCLUDE_DIR is empty even when OpenGL is found
2016-06-10 15:05:16 +02:00
a53f16edac
Merge branch 'CGAL_headers_only_step1-gdamiand_cjamin-old' into CGAL_headers_only_step1-gdamiand_cjamin
2016-06-09 19:09:38 +02:00
b8d2782e39
Remove empty include directory directive.
2016-06-09 16:19:55 +02:00
a5e04dcfd0
Update cmakes to deal with ZLIB in header only mode.
2016-06-09 15:39:56 +02:00
3cf08a5949
Set Eigen3 use file name in CGAL common
...
ensure the use file is known even if the FindEigen3.cmake
shipped with Eigen is used
2016-06-06 14:07:23 +02:00
89edc17cb1
Add quit to find_package; and improve error message for Qt5
2016-06-03 09:25:54 +02:00
b507b12d4f
Do not add in link_libraries in header only mode.
2016-06-01 19:18:43 +02:00
fc992ed0c3
Replace the string(REPLACE vc...) by a single string(REGEX REPLACE ...).
2016-06-01 09:59:27 +02:00
10469f9c4e
Update with master
2016-05-25 10:58:55 +02:00
a96ec65c54
Sort results of file(GLOB ...) to make build deterministic
...
Patch from Joachim Reichel <reichel@debian.org>, adapted from the flat
layout to the Git layout.
Fix #1048 .
2016-05-06 16:50:16 +02:00
71d91f9b99
Merge pull request #835 from bo0ts/patch-1
...
Require correct Boost version through CMake
2016-03-24 11:31:38 +01:00
5b48eedf20
Merge pull request #790 from bo0ts/Installation-remove_ALL_PRECONFIGURED-pmoeller
...
Remove option CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT and associated code
2016-03-24 11:30:14 +01:00
1526a93a31
CGAL_AUTO_LINK_ENABLED is also used for Boost & co
...
So we need it even in header-only mode.
CGAL auto-link is already disabled in auto_link.h so it's not a problem.
2016-03-11 09:47:59 +01:00
31d416df4e
Fixes the PR #788
...
With the split of `CGALConfig.cmake` into several files, one for each
lib, then the variable `CGAL_ImageIO_USE_ZLIB` was no longer stored in
`CGALConfig.cmake`.
That led to a full blue line in the testsuite:
https://cgal.geometryfactory.com/CGAL/Members/testsuite/results-4.8-Ic-155.shtml#Mesh_3_Examples
2016-03-10 11:56:55 +01:00
3536c89d70
Fix CGALConfig.cmake header-only
2016-03-09 18:53:59 +01:00
bcd3b6cde3
Remove unused variable
2016-03-09 17:31:24 +01:00
fd42bc1d15
Step 2
...
CGAL_ImageIO and CGAL_Qt5 are not even configured in header-only
mode. They will be configured later by `CGALConfig.cmake`.
2016-03-09 17:14:04 +01:00
24b156e3c6
Add cgal header only also in CGALConfig_install.cmake.in
2016-03-09 16:38:54 +01:00
b9d209ee62
Search required third party library in find component macro.
2016-03-09 12:41:42 +01:00
94f2565c6a
Replace the name of the variable to enable header only mode in CGAL_HEADERS_ONLY
2016-03-09 10:56:11 +01:00
0f0aa9f764
Remove the find_package qt5 do in CGAL_Macros.cmake which is now done in CGALConfig_binary.cmake.in
2016-03-09 10:50:53 +01:00
dff63d83d3
Correct the problem of cmake qt5 macro not available in header only when configuring cgal_qt5.
...
To solve this problem, we added in the macro check_cgal_component the find package of qt5 if we are configuring cgal_qt5.
2016-03-09 10:44:15 +01:00
38ca4dd5e0
Bugfix in check_cgal_component for its first call.
2016-03-09 10:42:46 +01:00
561b1f2a38
Do not need cgal_include_moc_files macro
2016-03-09 10:37:58 +01:00
16a19eb33e
Ok for demo for aabbtree
2016-03-09 10:37:57 +01:00
78cde742ce
Work on demo with qt5; ok for AABBtree (but need to be improved)
2016-03-09 10:35:22 +01:00
d56092753a
Make enable_header_only option persistent
2016-03-09 10:35:21 +01:00
c7d3a58688
Do not set CGAL_AUTO_LINK_ENABLED to TRUE in header only mode
2016-03-09 10:31:17 +01:00
a3ba66c458
include export and lib config files on demand
2016-03-04 12:05:25 +01:00
e261b3ad4f
Require correct Boost version through CMake
...
This catches errors early and provides a clear error message instead of waiting for something in a test or example to break.
2016-02-26 17:52:36 +01:00
9e7423fba6
Add missing _LIBRARY to variable on MSVC
2016-02-18 15:01:37 +01:00
0a685e82b3
Remove CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT from Macros
...
This is the only place that uses the option. Because the code was
wrongly indented (several ifs missing a level) the removal looks
horrible.
2016-02-16 17:21:23 +01:00
ecb34b3031
Remove option CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT
...
Do not add it to Config.cmake files anymore and remove it from the
interface
2016-02-16 17:20:22 +01:00
732d6ccb96
Generate a config file for each lib
2016-02-16 17:02:56 +01:00
1aa334ff34
Remove unnecessary variable
...
Never used anywhere and does not work with out-of-source builds
anyway...
2016-02-16 17:02:56 +01:00
4211a4f01e
Globally remove CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS
...
This is a Cmake 2.4.3 variable that isn't even documented anymore.
2016-02-16 17:02:55 +01:00
c3fba6c5ab
Remove unnecessary variable
...
Correct name would be CMAKE_COLOR_MAKEFILE and default is ON anyway.
2016-02-11 15:58:14 +01:00
2b49997c7e
Merge pull request #493 from afabri/CGLAL-thread_local_storage-GF
...
Remove boost thread dependency
2016-01-04 16:49:26 +01:00
c2003e8a2a
Add test for c++1z and gnu++XX flags
2015-12-17 10:18:20 +01:00
b5546cb802
Merge pull request #486 from lrineau/Installation-visual_leak_detector-lrineau
...
Enable the use of Visual Leak Detector in CGAL
2015-11-26 14:30:14 +01:00
e997e68582
missing c++98
2015-11-23 10:23:57 +01:00
260a501941
support more g++ version and enhance doc
2015-11-23 10:21:21 +01:00
d1489cd7e0
fix and simplify when boost libs are needed
2015-11-20 14:30:34 +01:00
86a2225a0c
boost thread not needed if using gcc 4.8 or greater in c++1[1/4] mode
2015-11-19 18:55:42 +01:00
6b2c4dd7c6
Merge branch 'CGLAL-thread_local_storage-GF-old' into CGLAL-thread_local_storage-GF
2015-11-09 14:26:42 +01:00
eb4f860f3b
remove mentions of Qt3
2015-10-05 15:19:58 +02:00
bd1de66629
Update CGAL_SetupBoost
2015-10-02 10:30:36 +02:00
d7c7747927
fix for non VC++
2015-10-02 10:23:27 +02:00
833bd5c49c
no Qt3 in the installation manual
2015-10-01 14:52:05 +02:00
47a41ccab0
cleanup
2015-10-01 12:38:55 +02:00
1a4faa8575
Merge branch 'CGLAL-thread_local_storage-GF-old' into CGLAL-thread_local_storage-GF
2015-10-01 10:03:04 +02:00
24666eb13e
deal with msvc12 and msvc14
...
until now, msvc14 is not supported by tbb (<= 4.4)
this commit prevents the testsuite from looking for it
2015-09-08 10:21:55 +02:00
bc5272495b
For MSVC we no longer require boost thread and system
2015-09-04 11:50:54 +02:00
714fc9092b
Remove an unused file
...
This file was unused for six years:
cmake/modules/CGAL_CreateSingleSourceCGALProgramQt4.cmake
I remove it.
2015-08-03 15:00:18 +02:00
f3d55fcb63
Add support for VC14 (from MSVC 2015)
...
There was eventually no VC13.
- In cmake/modules/CGAL_GeneratorSpecificSettings.cmake replace it by
MSVC14. Add a support for a futur MSVC15.
- Synchronize include/CGAL/auto_link/auto_link.h from the future
Boost-1.59 (not yet released), to add support for VC14/MSVC2015.
2015-07-30 11:28:13 +02:00
e43b1e42ba
Do include the export file if CMP0024 does not exist
...
With CMake-2.8.11, CMP0024 does not yet exist, and the target aliasing
feature does not exist either. So the only solution is to include the
export file.
2015-07-14 16:06:53 +02:00
877634ba9f
Avoid multiple definitions of the target aliases
...
With -DWITH_demos:BOOL=TRUE, the CGALConfig.cmake is included multiple
times. This patch avoids that one tries to define multiple times the
same target aliases.
2015-07-14 15:59:56 +02:00
3262264cbd
Search dependencies quietly
2015-07-14 15:12:47 +02:00
fb4975f469
Check if the libraries are actually defined
...
In CGALConfig.cmake, the former code was just checking if
WITH_${CGAL_LIB} was TRUE. Now, the new code also checks if the target
was actually defined. If the target is not defined by WITH_${CGAL_LIB}
is ON, if probably means that one dependency of the library was not
properly configured.
2015-07-14 15:12:47 +02:00
34ccb7facd
Merge pull request #133 from bo0ts/Installation-add_exports-pmoeller
...
Add a CGALExports.cmake file
Conflicts:
Installation/cmake/modules/CGALConfig_binary.cmake.in
This merge should fix the warning caused by CMP0024.
2015-07-13 12:45:19 +02:00
ed71d08e3d
Do not include the CGALExport.cmake file while still building CGAL
...
This rightfully triggers CMP0024, since the file created by export might
not exist at configure-time. We need to do some extra work to avoid
reading the LOCATION property from a non-imported target hence we
trigger policy CMP0026.
2015-07-10 15:33:37 +02:00
518faece88
Merge remote-tracking branch 'cgal-public-dev/CGAL-Qt5_support-GF' into CGAL-Qt5_support-GF
2015-07-10 14:04:03 +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
47b7ac3c07
update script to find QGLviewer so that the environment variable is used first
2015-07-10 11:32:20 +02:00
722abba27b
cosmetic changes to remove mentions of QT4
2015-07-07 18:00:43 +02:00
89184387d6
remove no longer needed QT4 cmake scripts
2015-07-07 18:00:43 +02:00
99f8b0d80e
Allow to find QGLViewer-qt5 on Windows too
2015-07-06 17:29:39 +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
a0e7a60973
Merge remote-tracking branch 'cgal/master' into CGAL-Qt5_support-GF
...
Conflicts:
Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
Alpha_shapes_3/demo/Alpha_shapes_3/MainWindow.cpp
Alpha_shapes_3/demo/Alpha_shapes_3/Viewer.h
GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt
GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt
GraphicsView/demo/Bounding_volumes/CMakeLists.txt
GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
GraphicsView/demo/Generator/CMakeLists.txt
GraphicsView/demo/GraphicsView/CMakeLists.txt
GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt
GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt
GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
GraphicsView/demo/Snap_rounding_2/CMakeLists.txt
GraphicsView/demo/Spatial_searching_2/CMakeLists.txt
GraphicsView/demo/Stream_lines_2/CMakeLists.txt
GraphicsView/demo/Triangulation_2/CMakeLists.txt
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
Mesh_3/demo/Mesh_3/CMakeLists.txt
Mesh_3/demo/Mesh_3/include/CGAL_demo/Scene_item_with_display_list.h
Mesh_3/demo/Mesh_3/src/CGAL_demo/Scene.cpp
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.cpp
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Polyhedron_demo_join_and_split_polyhedra_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
Polyhedron/demo/Polyhedron/Scene.cpp
Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.h
Polyhedron/demo/Polyhedron/Scene_implicit_function_item.h
Polyhedron/demo/Polyhedron/Scene_plane_item.h
Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h
Polyhedron/demo/Polyhedron/Scene_polylines_item.h
Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
Surface_mesher/demo/Surface_mesher/CMakeLists.txt
Triangulation_3/demo/Triangulation_3/CMakeLists.txt
Triangulation_3/demo/Triangulation_3/MainWindow.cpp
2015-06-30 09:17:26 +02:00
e7a6f80f05
Check for MSVC when defining library paths
...
We do not know the value of CGAL_AUTO_LINK_ENABLED yet because it is
defined by CGAL_GeneratorSpecificSettings.cmake but this is
equivalent. This is also not a problem, because CGAL_AUTO_LINK_ENABLED
is not user-editable and always enabled on MSVC.
2015-06-24 17:21:37 +02:00
8b6acec1b3
Use the LOCATION property to set _LIBRARY variables
...
Inspect the imported targets for information instead of using
configure_file.
2015-06-23 17:59:48 +02:00
9e807d8e2d
Include the export files through CGALConfig
2015-06-23 16:30:46 +02:00
7f3d6e35c5
Merging and integration of Polyhedron_Demo
...
- The Splatting has been deactivated
- The Scene_item class has a new member of type QOpenGLFunctions, allowing to use all shader functions without need for GLEW
2015-04-27 14:51:48 +02:00
ed3298ee2f
Merge branch 'Polyhedron-new_opengl_REBASED_to_ignore_reindentations-gf' into CGAL-Qt5_support-GF
...
Conflicts:
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_selection_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
Polyhedron/demo/Polyhedron/Scene.cpp
2015-04-27 08:50:06 +02:00
89348a1ab9
cut_plugin fixed
...
- replaced the missing modified files by the originals
- added a reference to a vector of floats in traits so that it fills it instead of drawing the bboxes
2015-04-24 15:59:23 +02:00
4a7a614e5d
Allow to find QGLViewer-qt5_
...
Conflicts:
Installation/cmake/modules/FindQGLViewer.cmake
2015-04-03 12:35:37 +02:00
4eef28be7e
Minimal version of Boost: 1.48
2015-04-01 17:31:17 +02:00
Laurent Rineau
Efi Fogel
Andreas Fabri
Sébastien Loriot
Simon Giraudot
Jane Tournois
Mael Rouxel-Labbé
Guillaume Damiand
Thomas "elfprince13" Dickerson
Clement Jamin
Michel Zou
Thiago M. de C. Marques
Clément Jamin
Maxime Gimeno
Philipp Moeller
Philipp Möller
Sebastien Loriot
Laurent Rineau