Commit Graph

84 Commits

Author SHA1 Message Date
Sébastien Loriot 6b15ec643c Merge branch 'CGAL-Qt5_support-GF' into cgal-public-dev/Polygon_mesh_processing-GF
Conflicts:
	Mesh_3/demo/Mesh_3/include/CGAL/gl_render.h
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/GlSplat/GlSplat.cpp
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
2015-07-16 16:52:53 +02:00
Laurent Rineau 15c1469a54 CGAL requires CMake>=2.8.11. 2015-07-10 17:01:42 +02:00
Laurent Rineau 3ec0c69f8f We want 2.8.10 for all demos
Previous versions are not tested by the CGAL daily test suite.
2015-07-09 17:50:22 +02:00
Laurent Rineau e5bcdc5f3e Update all CMakeLists.txt
- CMake 2.8.11 or later is now required
- GLEW is no longer used by demo/Polyhedron/
2015-07-06 18:14:34 +02:00
Andreas Fabri 20c1b1a1f6 Merge branch 'Polygon_mesh_processing-GF-old' into Polygon_mesh_processing-GF
Conflicts:
	BGL/include/CGAL/boost/graph/Euler_operations.h
	BGL/include/CGAL/boost/graph/iterator.h
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/doc/Documentation/dependencies
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_inside_polyhedron_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Selection_widget.ui
2015-07-01 13:52:44 +02:00
Laurent Rineau e020872989 Merge two commits forgotten in pull-request #110
https://github.com/CGAL/cgal/pull/110

Fixes issue #124.
  https://github.com/CGAL/cgal/issues/124

Merge remote-tracking branch 'cgal-dev/Polyhedron_iostream-Binary_STL_Readder-GF'
2015-06-17 10:20:28 +02:00
Laurent Rineau 5bbd4e8cdb fix permissions 2015-06-17 10:09:02 +02:00
Andreas Fabri b46abc8b02 remove argc argv 2015-06-09 08:57:10 +02:00
Andreas Fabri 9c7a335a0b char* -> const char* to avoid a warning 2015-06-09 08:54:09 +02:00
Andreas Fabri 18a4c57f34 int -> std::size_t 2015-06-08 11:29:24 +02:00
Andreas Fabri 6cf8ca0947 move stl2off.cpp to test as it uses an undocumented function 2015-06-05 16:33:53 +02:00
Andreas Fabri 087f4acb0e fix warnings 2015-06-05 16:07:04 +02:00
Sébastien Loriot 166e5e03ea more generic reader 2015-02-09 16:51:32 +01:00
Sébastien Loriot b4bd141980 move OFF reading function to a header file 2015-01-29 14:02:47 +01:00
Sébastien Loriot ccbcb8b23f remove typename 2015-01-26 08:59:47 +01:00
Sébastien Loriot 00a57be25a remove the STL reading part outside of the builder 2015-01-23 15:01:16 +01:00
Sébastien Loriot fcd2e56742 cleanup 2015-01-23 14:09:40 +01:00
Sébastien Loriot 1ee29eb3e1 int[] -> array 2015-01-23 12:17:31 +01:00
Sébastien Loriot 5c956f1ccd replace tuple by array 2015-01-23 11:47:23 +01:00
Sébastien Loriot b551c0fa55 move Polyhedron builder from STL files from demo plugin to header 2015-01-23 10:40:15 +01:00
Laurent Rineau cacb30d969 Fix the conversion to void*
LLVM libc++ does not implement std::basic_ios::operator void*, even in
C++03.
2014-02-13 11:02:51 +01:00
Laurent Rineau 269ae1ca61 Fix the uses of std::basic_ios::bad(), and use fail() instead.
bad() implies fail() but std::basic_ios::operator! is actually equivalent
to std::basic_ios::fail(), not bad().

For example,
    std::ifstream is(argv[1]);
    if (is.bad()) {
is probably wrong because, in case the file does not exist, only the failbit it set,
and not the badbit.

Other example:
   double x;
   is >> x;
If the stream 'is' does not contains a string that can represent a double,
then failbit is set (and maybe the eofbit if the stream is actually too
short), but not the badbit.

bad() can be used, in case fail() returned true, to discriminate between a
I/O error and a logical error.

See:
  http://en.cppreference.com/w/cpp/io/basic_ios/operator_bool
  http://en.cppreference.com/w/cpp/io/ios_base/iostate
2013-12-12 16:13:40 +01:00
Laurent Rineau 008ccc5b48 Add missing #include <cassert> 2013-04-25 11:20:36 +02:00
Sébastien Loriot 9fcf46e11a replace CGAL_[kernel/qpe/triangulation/]_assertion by assert in tests
this should be the case, following our guidelines.

using:
find */test/* -name '*.[hc]*' | xargs sed -i 's/CGAL_assertion/assert/g'
2013-03-21 10:50:55 +01:00
Laurent Rineau 2d8da664a3 Merge branch 'CGAL-fix_warnings-gdamiand'
Conflicts:
	.gitignore
	Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt
2013-02-22 13:02:37 +01:00
Laurent Rineau 26a7e70785 New license.txt files (eol changes)
The new version 2.13.0 of licensecheck has changed the spaces at eol.
2013-02-19 16:46:39 +01:00
Andreas Fabri 13bac84716 less warnings in various packages 2013-02-01 10:27:07 +01:00
Laurent Rineau 2db4effa7e CMake: Fix the handling of cmake_policy
That is a followup-to my commit last year:
  | ------------------------------------------------------------------------
  | r63198 | lrineau | 2011-04-28 19:45:22 +0200 (Thu, 28 Apr 2011) | 5 lines
  | 
  | Try to fix my last revision about cmake_policy, with CMake-2.6.x
  | 
  | CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
  | x.y.z is greater than the current CMake version.
  | 
  | ------------------------------------------------------------------------

The following check:
  if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
is useless just after a call to:
 cmake_minimum_required(VERSION 2.6.2)



The script used to fix that was:


#!/usr/bin/env perl

$replacement=<<'END';
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
  cmake_policy(VERSION 2.8.4)
else()
  cmake_policy(VERSION 2.6)
endif()
END

while(<>) {
    if(/if\("\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6\)/) {
        while(<>) {
            if(/^endif\(\)/) {
                print "$replacement";
                while(<>) {
                    print;
                }
                exit 0
            }
        }
    }
    print;
}
2012-08-22 12:35:03 +00:00
Marc Glisse a758751485 Remove / comment out unused local typedefs. Fix one place where FT was used instead of RT (homogeneous coordinates, probably never compiled). 2012-07-28 06:21:06 +00:00
Laurent Rineau c8a14fb91b Remove the deprecated use of Triangulation_euclidean_traits_xy_3
and use Projection_traits_xy_3 instead.
2012-06-13 09:05:33 +00:00
Philipp Möller 8f1ce2412c Removed all places where the CGAL_CFG_NO_TMPL_IN_TMPL work-around was
used. Those were mostly in Polyhedron and HalfedgeDS but some places
in Arrangement_2 used it, too. Neither of the parts of Arrangement_2
have been documented.
2012-04-13 13:13:30 +00:00
Laurent Rineau a37c74d534 Add license files, per package 2012-01-16 15:54:22 +00:00
Laurent Rineau 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +00:00
Philipp Möller 34d6ac52ec Replaced [U]Integer* with boost::[u]int*_t in Polyhedron, Polyhedron_IO and Stream_support 2011-06-10 14:51:30 +00:00
Laurent Rineau 3c02e07b23 Try to fix my last revision about cmake_policy, with CMake-2.6.x
CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
x.y.z is greater than the current CMake version.
2011-04-28 17:45:22 +00:00
Laurent Rineau c97205f085 Global handling of CMake policies (second part)
We declare 
  cmake_minimum_required(VERSION 2.6.2)
but we also use
  cmake_policy(VERSION 2.8.4)
to declare that our CMake scripts are OK with all the defaults of CMake policies
as of CMake-2.8.4. That shuts down the warnings of CMake-2.8.4.

That way, we no longer need any declaration of specific policies.

Those two lines must be present and maintained in all our CMakeLists.txt
files (the one for the libraries, and also the one for examples and demos,
and maybe tests).
2011-04-28 10:55:56 +00:00
Laurent Rineau 0631943153 Uniform capitalization in our CMake script: use lowercase for commands 2011-04-28 10:36:18 +00:00
Laurent Rineau ca5c92e034 Global maintenance of CMakeLists.txt: CMake minimal version is -2.6.2
The documentation of CGAL says that the minimal version of CMake must be
CMake-2.6.2.
  - change cmake_minimum_required to VERSION 2.6.2
  - no longer any need for the policy CMP0003 (was for 2.4.x)
  - no longer any need for CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS (was for 2.4)
2011-04-27 17:58:27 +00:00
Sébastien Loriot 6113a8b536 remove warning 2011-02-24 16:05:50 +00:00
Andreas Fabri da076665d2 int -> size_t 2010-11-27 09:50:32 +00:00
Laurent Rineau cdf0322256 Let's remove all makefiles, now. 2010-08-23 11:03:02 +00:00
Sébastien Loriot 5471e90cd1 s/succesful/successful 2010-08-12 08:30:26 +00:00
Laurent Rineau ae34a83cf1 int -> size_t 2010-06-28 10:55:25 +00:00
Andreas Fabri 83d4ef1d1b Use stream::bad() 2010-06-25 08:41:51 +00:00
Andreas Fabri d6d5c6c558 Cartesian->Simple_cartesian / float->double / int -> size_t 2010-06-24 08:40:19 +00:00
Andreas Fabri 1c3f1f22db int -> size_t 2010-06-23 13:41:30 +00:00
Laurent Rineau 5d77f6a49f Fix the calls to OFF_scanner.scan_facet and
.scan_facet_vertex_index. std::size_t shoud be used, now, instead of
Integer32.
2010-06-23 09:21:43 +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
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 e0a2006631 Remove semi-colon after main() function definition. 2009-12-12 14:32:20 +00:00