Commit Graph

194 Commits

Author SHA1 Message Date
Philipp Möller feceb5a028 Add the macro CGAL_CFG_NO_CPP0X_UNIFIED_INITIALIZATION_SYNTAX 2012-12-11 17:41:54 +01:00
Philipp Möller ab5c017c08 Unconditionally disable NO_TR1 defines.
Those cause trouble, because on MSVC the include paths for tr1
components are different from gcc. Instead of fixing up the include
paths depending on platform, just never use a tr1 component. Nothing
of value is lost compared to the boost equivalents and it removes
another code-path.
2012-09-28 13:15:14 +00:00
Laurent Rineau 90414d195f Move <CGAL/Testsuite/use.h> to <CGAL/use.h> (in the Installation package)
That is a followup to the following commit:
  | ------------------------------------------------------------------------
  | r71090 | pmoeller | 2012-08-07 13:04:32 +0200 (Tue, 07 Aug 2012) | 6 lines
  | Changed paths:
  |    M /branches/next/Alpha_shapes_2/include/CGAL/Alpha_shape_2.h
  |    M /branches/next/Circulator/include/CGAL/circulator.h
  |    M /branches/next/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Reflex_vertex_searcher.h
  |    M /branches/next/Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp
  |    M /branches/next/Kernel_d/include/CGAL/Cartesian_d.h
  |    M /branches/next/Mesh_3/include/CGAL/IO/File_medit.h
  |    M /branches/next/Mesh_3/include/CGAL/Mesh_cell_criteria_3.h
  |    M /branches/next/Mesh_3/include/CGAL/Mesh_edge_criteria_3.h
  |    M /branches/next/Mesh_3/include/CGAL/Mesh_facet_criteria_3.h
  |    M /branches/next/Mesh_3/include/CGAL/make_mesh_3.h
  |    M /branches/next/Nef_2/include/CGAL/Bounded_kernel.h
  |    M /branches/next/Nef_2/include/CGAL/Nef_polyhedron_2.h
  |    M /branches/next/Nef_3/include/CGAL/Nef_3/ID_support_handler.h
  |    M /branches/next/Nef_3/include/CGAL/Nef_3/Infimaximal_box.h
  |    M /branches/next/Nef_3/include/CGAL/Nef_3/vertex_cycle_to_nef_3.h
  |    M /branches/next/Nef_3/include/CGAL/Nef_polyhedron_3.h
  |    M /branches/next/Nef_3/test/Nef_3/nef_union_error_llvm.cpp
  |    M /branches/next/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h
  |    M /branches/next/OpenNL/include/CGAL/OpenNL/blas.h
  |    M /branches/next/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h
  |    M /branches/next/Point_set_processing_3/include/CGAL/mst_orient_normals.h
  |    M /branches/next/QP_solver/include/CGAL/QP_solver/QP_functions_impl.h
  |    M /branches/next/STL_Extension/include/CGAL/iterator.h
  |    M /branches/next/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_simple_site_2.h
  |    M /branches/next/Subdivision_method_3/include/CGAL/Polyhedron_decorator_3.h
  |    M /branches/next/Subdivision_method_3/include/CGAL/Subdivision_mask_3.h
  |    M /branches/next/Surface_mesher/include/CGAL/Surface_mesh_default_criteria_3.h
  |    M /branches/next/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Adaptation_traits_functors.h
  |    M /branches/next/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_inserters.h
  |    M /branches/next/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_removers.h
  | 
  | WARNFIX: Silence a good part of unused variable/parameter warnings.
  | 
  | Wextra results in a dreadful wall of yellow in the test-suite and is
  | scary when using CGAL. Reduce some of the noise by silencing the
  | obvious cases with CGAL_USE or comments.
  | 
  | ------------------------------------------------------------------------

The reason is that everything from CGAL/Testsuite/ is removed in public
releases (that was discussed at a CGAL developers meetings, long ago). That
means that r71090 introduced compilation errors undetectable by the tests
of internal releases. I hope that the minutes of that developers meeting
say that I was against the removal of headers between internal and public
releases!  -- Laurent Rineau
2012-08-09 15:34:08 +00:00
Laurent Rineau 4953bbbc86 Remove buggy executable bits 2012-07-04 19:28:22 +00:00
Philipp Möller 8720500433 Guard some macros with an additional check against BOOST_VERSION
This will not hinder usability. Compiling a three year old Boost
release with C++11 enabled is a bad idea anyway.
2012-06-13 12:33:33 +00:00
Marc Glisse ad2e67797a next, prev, copy_n in C++11. 2012-05-20 15:09:15 +00:00
Marc Glisse c26419086e CGAL_CFG_NO_STATEMENT_EXPRESSIONS only for gcc 2012-05-20 14:15:03 +00:00
Marc Glisse 2644615fae remove now unused file 2012-05-20 13:14:56 +00:00
Marc Glisse 9de2b137e3 move gcc macros 2012-05-20 13:14:34 +00:00
Philipp Möller 542f5d9c51 Merged ^/branches/next here 2012-04-16 08:53:21 +00:00
Laurent Rineau a429b26316 Cherry-pick that revision from /branches/features/Mesh_3-parallel-cjamin/
| ------------------------------------------------------------------------
  | r68020 | cjamin | 2012-03-12 18:27:30 +0100 (Mon, 12 Mar 2012) | 1 line
  | 
  | To be able to build CGAL on MSVC11
  |
  ------------------------------------------------------------------------

It adapts CGAL CMake scripts and CGAL auto-link headers to MSVC2011.

Thanks to Clement Jamin, from Inria, for the patch.
2012-03-19 14:26:17 +00:00
Laurent Rineau 3d01e09cb8 Workaround for a bug in Boost, that checks WIN64 instead of _WIN64
https://svn.boost.org/trac/boost/ticket/5519
2012-01-30 10:15:20 +00:00
Laurent Rineau aa6184e8a1 merge changes from next 2012-01-27 12:55:23 +00:00
Laurent Rineau a8988af6a7 Typo in the macro Q_MOC_RUN 2012-01-26 13:22:08 +00:00
Laurent Rineau 76f6503a3f Try to fix the bug between Qt moc and "namespace BOOST_JOIN(...)" 2012-01-26 12:00:16 +00:00
Laurent Rineau 24ec9f43fb merge changes from next 2012-01-25 11:23:02 +00:00
Laurent Rineau 7177fa5a63 Add a check that NDEBUG is not defined by test platforms 2012-01-25 11:14:17 +00:00
Laurent Rineau baeec2d53f merge all the changes from next! 2012-01-20 17:45:27 +00:00
Laurent Rineau 7f0df0919c Fix the license header
That file is under Boost Software License. We cannot relicence it like we
want!
2012-01-19 16:50:34 +00:00
Laurent Rineau e597f13bf7 Remove that auto-generated file! 2012-01-17 10:21:58 +00:00
Philipp Möller 6415622971 Removed unused define. 2011-12-14 10:38:31 +00:00
Laurent Rineau 7c64fe7394 Add versioninfo to created DLLs. 2011-10-25 15:17:08 +00:00
Laurent Rineau 13447f666c auto-link files must include <CGAL/config.h>
<CGAL/config.h> includes <CGAL/compiler_config.h>, that is generated during
the build of libraries. CGAL_BUILD_SHARED_LIBS is defined in it.
2011-10-24 09:23:21 +00:00
Laurent Rineau a49a4976a2 Change the name mangling of CGAL libraries, on Windows
We adopt the naming scheme of Boost libraries, with the "lib" prefix for
static libraries. And with the CGAL_VERSION as suffix.

For example, static libraries will be named:
  libCGAL_Qt4-vc100-mt-gd-3.10-Ic-123.lib
and DLL will be named:
  CGAL_Qt4-vc100-mt-gd-3.10-Ic-123.dll
2011-10-21 14:10:52 +00:00
Laurent Rineau 338c6a9925 Update the export feature to non-Microsoft compilers
Support the ELF visibility feature of gcc/icl/clang
2011-10-18 16:53:54 +00:00
Laurent Rineau badcdb5871 Completely remove the support for auto-linking of GMP and MPFR
I have grepped for auto_link/(GMP|MFR)|AUTO_?LINK_(GMP|MPFR) and I removed
completely any support for auto-linking of GMP and MPFR from CGAL.

That is no longer necessary, nor relevant, no that we provide precompiled
GMP and MPFR libraries under standard names libgmp-10.lib and
libmpfr-4.lib.

To test in candidates: 
   Core
   Installation
   Number_types
2011-10-14 13:39:45 +00:00
Laurent Rineau dfba14f23c Rename <CGAL/$LIB/export.h> to <CGAL/export/$LIB.h> 2011-10-12 09:43:19 +00:00
Laurent Rineau 87148361ff Rename CGAL_BUILD_SHARED_LIB to CGAL_BUILD_SHARED_LIBS
Better name, and more coherent with CMake variable name:
  BUILD_SHARED_LIBS
2011-10-11 13:52:25 +00:00
Sébastien Loriot 91a5327fa8 change LGPLv2 -> LGPLv3 2011-10-10 13:48:25 +00:00
Laurent Rineau 3d3662850e <CGAL/export.h> must be included *after* <CGAL/compiler_config.h>
because CGAL_BUILD_SHARED_LIB is defined in the later.
2011-10-07 14:26:14 +00:00
Laurent Rineau 02d3b31a33 merge next into this branch 2011-10-06 16:06:34 +00:00
Laurent Rineau aa00f78883 Also support the compilation of CGAL libraries as static libs, with MSVC. 2011-10-06 16:01:16 +00:00
Laurent Rineau b0fe1aa5c9 Make the messages generated by CGAL_LIB_DIAGNOSTIC a bit more recognizable 2011-10-06 11:49:20 +00:00
Andreas Fabri 8c9865daef Add GF copyright header 2011-10-06 09:59:07 +00:00
Andreas Fabri cbfe32ce37 Add declspecs for Visual C++ so that we can build dlls 2011-10-05 19:12:23 +00:00
Laurent Rineau e8869cf82d Make CGAL lib not depend on CGAL_Core 2011-10-05 10:08:52 +00:00
Laurent Rineau d39a8d62ac Avoid to auto-link with CGAL.lib while building the CGAL library itself 2011-10-05 09:24:19 +00:00
Sébastien Loriot dff6dda8b3 Remove from copyright holder
Freie Universitaet Berlin (Germany), Martin-Luther-University Halle-Wittenberg
(Germany) and RISC Linz (Austria) as they transfer the copyright to other
sites.
2011-09-21 19:46:31 +00:00
Laurent Rineau 808ebae064 Merge
| ------------------------------------------------------------------------
  | r64601 | pmoeller | 2011-07-05 15:17:52 +0200 (Tue, 05 Jul 2011) | 2 lines
  | Changed paths:
  |    A /branches/features/gsoc2011-boost_object-pmoeller/Installation/include/CGAL/internal/deprecation_warning.h
  |    M /branches/features/gsoc2011-boost_object-pmoeller/Installation/test/Installation/CMakeLists.txt
  |    A /branches/features/gsoc2011-boost_object-pmoeller/Installation/test/Installation/deprecation_warning.cpp
  | 
  | Added deprecation_warning.h and a pseudo useful test.
  | 
  | ------------------------------------------------------------------------
2011-07-06 12:49:49 +00:00
Marc Glisse 399e75b7f8 Add CGAL_CFG_NO_CPP0X_STATIC_ASSERT to the g++-4.3 list and fix a typo. 2011-05-11 10:14:02 +00:00
Eric Berberich eb7a5ed11e branch-build is now HOT on next ;-) 2011-04-15 09:12:06 +00:00
Eric Berberich 2733a26a3f Qt -> Qt3 2011-04-15 08:43:49 +00:00
Laurent Rineau 843f0d8c0b Fix the auto-link of libtaucs and libmetis on 32 bits: no name
mangling. Same for 32 and 64 bits.
2010-08-20 16:28:49 +00:00
Laurent Rineau d1cf7e4698 Name mangling is no longer used for BLAS/LAPACK/TAUCS on Windows: we now
provide only one variant: /MT.
2010-08-10 14:07:57 +00:00
Laurent Rineau 32883cfb33 Revert my revision 57078. That was stupid: undefined macros will also
trigger a compilation error!
2010-06-24 16:57:37 +00:00
Laurent Rineau f0438cad2c Turn #warning into #error. This is only for SunPro with an incorrect STL. 2010-06-24 16:10:24 +00:00
Laurent Rineau f306daec83 Sort of poisoning of CGAL_(BEGIN|END)_NAMESPACE when
CGAL_NO_DEPRECATED_CODE is defined.
2010-06-24 16:07:39 +00:00
Laurent Rineau 6405de3c08 Merged revisions 56829 via svnmerge from
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r56829 | lrineau | 2010-06-17 11:13:20 +0200 (Thu, 17 Jun 2010) | 2 lines
  
  Argl!! Important error in auto_link.h for MSVC 2010!
........
2010-06-17 09:43:01 +00:00
Sébastien Loriot d72337785c remove dependance on CGAL_PDB: merge from the branche created for that purpose
I do not remove the directory CGAL_PDB as I am allowed to use svn remove.
2010-06-10 17:26:38 +00:00
Sylvain Pion 93f042b6d7 Fix indentation. 2010-06-10 16:14:31 +00:00
Sébastien Loriot 825835fc74 CGAL namespace macro inside CGAL_NO_DEPRECTED_CODE if statement 2010-06-09 11:56:53 +00:00
Sébastien Loriot 52317dd49f add python script (replace_CGAL_NAMESPACE.py) to replace CGAL_BEGIN_NAMESPACE and CGAL_END_NAMESPACE
by namespace CGAL { and } //namespace CGAL. in all .h and .cpp files
in a directory.
Apply it to all packages in the trunk
Remove macro definition from the config.h file.
2010-06-09 07:37:13 +00:00
Laurent Rineau fcbd4fd872 Merged revisions 56638,56640 via svnmerge from
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r56638 | sloriot | 2010-06-08 13:27:58 +0200 (Tue, 08 Jun 2010) | 3 lines
  
  apply modify from r56637 to 3.6-branch
........
  r56640 | lrineau | 2010-06-08 14:51:20 +0200 (Tue, 08 Jun 2010) | 2 lines
  
  CMake/autolink patch for unofficial MSVC10 support.
........
2010-06-08 12:59:55 +00:00
Laurent Rineau 0bda1d5591 Disable CGAL_Core if void* is size 8 (ie 64 bits). 2010-03-19 14:15:25 +00:00
Laurent Rineau ef36d737af Fix Sylvain's patch r53663 2010-03-16 09:32:04 +00:00
Sylvain Pion 85dc12f2a7 Remove empty lines at beginning and end of files
(apply Scripts/developer_scripts/remove_empty_lines.pl).
2010-02-01 12:55:28 +00:00
Sylvain Pion 99be0d6d21 Post-process the CGAL_CFG_NO_CPP0X_* flags for GCC when -std=c++0x is set. 2010-01-18 18:08:14 +00:00
Sylvain Pion 7a1276a751 Generate warning on MacOSX for g++-4.0 and optimization. 2009-12-03 10:16:09 +00:00
Laurent Saboret be09d80d95 * Bug fix: fixed compatibility of TAUCS/BLAS/LAPACK precompiled libraries with Visual C++ 9.0 2008:
CGAL 3.5 will include TAUCS/BLAS/LAPACK precompiled libraries for Visual C++ 8.0 and 9.0. 
Auto-link is modified accordingly.

* Also fixed compatibility of cgal_test_with_cmake.bat scripts with VC++ 9.0.
2009-08-26 16:23:28 +00:00
Sylvain Pion dd9a147db5 RW STL : turn the #error into a #warning. 2009-05-26 08:18:11 +00:00
Sylvain Pion 9601658698 New config testfile to check for some C++0x feature.
gcc supports it at least in C++0x mode.
2008-12-09 14:56:51 +00:00
Laurent Rineau 4686cb8df4 Revert revision 47046. 2008-11-26 15:35:30 +00:00
Laurent Rineau 186cc049df Hardcode "vc80" as TOOLSET for gmp and mpfr. Those libraries are C
libraries (not C++) and we do not need to distinguish between versions of
VC for C libraries.
2008-11-26 11:33:30 +00:00
Laurent Rineau 8fc1ad743d Fix all auto-link names!
(Followup of revision 46204.)
2008-10-12 10:31:12 +00:00
Laurent Rineau 61ae23aadd Fix auto-linking of CGAL_Core 2008-10-11 10:32:24 +00:00
Laurent Rineau d8ebb21427 Add <CGAL/glu.h>, used for Windows and MacOS X compatibility. 2008-10-08 11:31:10 +00:00
Laurent Rineau 6c066dec2d Ooops!
CGAL-Qt3 autolink was broken since I renamed it!
2008-09-23 14:43:45 +00:00
Sylvain Pion dcefe2bffa Use <OpenGL/gl.h> on __APPLE__ also in the test program.
(why do people not use <CGAL/gl.h> in demos ?)
2008-09-08 11:40:39 +00:00
Fernando Cacciola f7adea31f0 Fix gl.h location for Apple 2008-09-01 13:38:01 +00:00
Sylvain Pion 1498ef01c6 Add a macro CGAL_NO_DEPRECATION_WARNINGS that disables CGAL_DEPRACATED.
(can be used by users temporarily, while they have not updated their code,
but still want to work in good conditions)
2008-07-28 18:10:41 +00:00
Sylvain Pion eff6efd3af CGAL_NULL and CGAL_NULL_TYPE are now constant macros, so replace them by:
- CGAL_NULL -> NULL
- CGAL_NULL_TYPE -> CGAL::Nullptr_t (typedef to const void *)
2008-07-12 21:58:52 +00:00
Fernando Cacciola ecb77a9897 Revert screw up of CGAL_HAS_THREADS 2008-05-28 16:19:23 +00:00
Sylvain Pion 110a5db8be Rename all C++0x related config macros to consistently have CPP0X in their name,
as in CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES.
2008-05-21 15:34:36 +00:00
Laurent Rineau 2ce23ea470 Add a new header <CGAL/gl.h>, whose purpose is to wrap the #include of
GL/gl.h: on windows, <windows.h> has to be included first.

Image_3.cpp uses that header now.
2008-04-18 09:02:03 +00:00
Fernando Cacciola 17c33bcd93 Avoid linking against boost-thread if that lib has not been built 2008-04-08 19:28:16 +00:00
Fernando Cacciola 2a2efa6450 Added support for Visual Studio 2008 2008-04-08 19:24:28 +00:00
Sylvain Pion 939eb6384e Attempt at using a common definition for CGAL_NULL and CGAL_NULL_TYPE,
not something with a GCC specific case.
2008-04-03 12:32:44 +00:00
Fernando Cacciola 9d5411bb18 Various CMake fixes 2008-02-12 20:36:56 +00:00
Fernando Cacciola 168a5fce48 Sync library names with those produced now by cmake 2008-02-08 17:27:25 +00:00
Andreas Fabri 52357e39bf name of library changed 2008-02-08 14:23:46 +00:00
Sylvain Pion a8243a3f12 Introduce a new macro CGAL_SUNPRO_INITIALIZE to workaround a SunPRO warning properly.
(can't write a test program for a warning)
2008-01-20 21:39:25 +00:00
Sylvain Pion 4d1b8d63e3 Remove workarounds and support for the BORLAND compiler. 2008-01-20 20:24:20 +00:00
Sylvain Pion 06131a8eb9 Remove obsolete definition of CGAL_USE_CGAL_WINDOW 2008-01-10 18:19:26 +00:00
Sylvain Pion 0d04db797e CGAL_CFG_DONT_OVERLOAD_TOO_MUCH is only needed by SunPRO. 2008-01-03 16:47:40 +00:00
Sylvain Pion 64f23bbc47 Sun_fixes.h is now so small, let's merge it in config.h. 2008-01-03 15:26:51 +00:00
Sylvain Pion f5a9c2d26e Finish removal of CGAL_CFG_SUNPRO_RWSTD obsolete workarounds. 2008-01-03 15:22:29 +00:00
Sylvain Pion 284cfd9468 More removal of SUNPRO+RW's STL obsolete workarounds:
CGAL_CFG_RWSTD_NO_MEMBER_TEMPLATES
2008-01-03 15:19:39 +00:00
Sylvain Pion 2b46416907 Remove more SUNPRO + RW's STL obsolete workarounds:
CGAL_CFG_SUNPRO_RWSTD (partially)
CGAL_reverse_iterator()
2008-01-03 15:04:30 +00:00
Sylvain Pion 88ed563f44 Remove some workarounds for SunPRO + RW's STL:
CGAL_CFG_MISSING_TEMPLATE_VECTOR_CONSTRUCTORS_BUG
CGAL_CFG_RWSTD_NO_MEMBER_TEMPLATES  (partially so far)
CGAL_make_vector
CGAL_make_list
2008-01-03 14:50:13 +00:00
Sylvain Pion 73a75d109f SunPRO's RW STL is not supported anymore.
For now, move the corresponding config bits out of the main config files.
2008-01-02 17:49:08 +00:00
Sylvain Pion accdf57415 CGAL_CFG_NO_LONG_DOUBLE_IO is not needed anymore (pgCC is fixed). 2008-01-02 16:35:13 +00:00
Sylvain Pion 8ab2fe93bb Move definitions of CGAL_NULL and CGAL_NULL_TYPE from circulator.h to config.h. 2007-12-28 15:46:09 +00:00
Sylvain Pion 119bc8b9f1 Add CGAL_NORETURN macro to be able to use __attribute__ ((__noreturn__)). 2007-11-05 10:56:36 +00:00
Sylvain Pion c5ad51a83c Add CGAL_HAS_THREADS. 2007-10-18 15:00:08 +00:00
Ophir Setter c767849dad Supporting only microsoft VC7.1 and up 2007-09-05 18:38:38 +00:00
Ophir Setter 7611ee977a Added deprecated macro 2007-09-05 18:32:46 +00:00
Laurent Saboret 84e925e42d Undo rev 40102 2007-09-03 08:05:09 +00:00
Laurent Saboret 7a4809dc5c TEMPORARY (until CGAL 3.4 Windows installer is out): add back CGAL_LIB_STD and CGAL_WRAP for VisualC++ developers who link against CGAL 3.3. 2007-08-29 09:51:04 +00:00
Laurent Saboret 3ade5b0811 Support of CBLAS, CLAPACK and TAUCS in install_cgal on Windows 64 and Linux 64. I renamed S72-LAPACK to S72-DEFAULTLAPACK to workaround a bug in install_cgal when a package and a feature have the same name. 2007-08-28 15:15:06 +00:00
Marc Glisse b3a43d3c7f Same workaround for list constructor as for vector constructor. 2007-08-28 09:46:21 +00:00