songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch

This commit is contained in:
Laurent Rineau 2019-05-23 08:44:39 +02:00
parent e4c82fa260 f51b7e7934
commit 7be5e3fbe5
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Convex_hull_3/include/CGAL/Convex_hull_traits_3.h
View File

@ -159,7 +159,12 @@ struct GT3_for_CH3 {
template <class R_, class Polyhedron = Default, class Has_filtered_predicates_tag = Tag_false>
template <class R_, class Polyhedron = Default,
class Has_filtered_predicates_tag = Boolean_tag
<
boost::is_floating_point<typename R_::FT>::type::value &&
R_::Has_filtered_predicates_tag::value
> >
class Convex_hull_traits_3
{
public:

7
Installation/cmake/modules/CGAL_add_test.cmake
View File

@ -114,7 +114,12 @@ function(cgal_setup_test_properties test_name)
APPEND PROPERTY DEPENDS "compilation_of__${exe_name}")
endif()
if(POLICY CMP0066) # CMake 3.7 or later
get_filename_component(_source_dir_abs ${CMAKE_CURRENT_SOURCE_DIR} ABSOLUTE)
get_filename_component(_binary_dir_abs ${CMAKE_CURRENT_BINARY_DIR} ABSOLUTE)
string(FIND "${_binary_dir_abs}" "${_source_dir_abs}" _search_binary_in_source)
if(_search_binary_in_source EQUAL "-1"
AND POLICY CMP0066) # CMake 3.7 or later
if(NOT TEST ${PROJECT_NAME}_SetupFixture)
if(ANDROID)
add_test(NAME ${PROJECT_NAME}_SetupFixture

4
Nef_3/include/CGAL/boost/graph/convert_nef_polyhedron_to_polygon_mesh.h
View File

@ -151,8 +151,8 @@ struct Shell_polygons_visitor
polygons.back().push_back(vertex_indices[v[1]]);
polygons.back().push_back(vertex_indices[v[2]]);
polygons.push_back( std::vector<std::size_t>() );
polygons.back().push_back(vertex_indices[v[2]]);
polygons.back().push_back(vertex_indices[v[0]]);
polygons.back().push_back(vertex_indices[v[2]]);
polygons.back().push_back(vertex_indices[v[3]]);
}
else
@ -162,8 +162,8 @@ struct Shell_polygons_visitor
polygons.back().push_back(vertex_indices[v[0]]);
polygons.back().push_back(vertex_indices[v[2]]);
polygons.push_back( std::vector<std::size_t>() );
polygons.back().push_back(vertex_indices[v[0]]);
polygons.back().push_back(vertex_indices[v[2]]);
polygons.back().push_back(vertex_indices[v[0]]);
polygons.back().push_back(vertex_indices[v[3]]);
}
}