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

Merge from next

This commit is contained in:
Andreas Fabri 2011-11-17 13:24:25 +00:00
parent 9f08027941 3bfa2c96b6
commit 2f60746408
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -1,5 +1,5 @@
# Top level CMakeLists.txt for CGAL-branchbuild
project(CGAL)
project(CGAL CXX)
cmake_minimum_required(VERSION 2.6.2)
@ -26,10 +26,19 @@ if ( ${CGAL_SCM_NAME} STREQUAL "svn" )
find_program(SVN_EXECUTABLE svn DOC "subversion command line client")
function(Subversion_GET_URL dir variable)
execute_process(COMMAND cygpath "${dir}"
OUTPUT_VARIABLE dir_cygpath
RESULT_VARIABLE cygpath_error)
# use svnversion
execute_process(COMMAND "${SVN_EXECUTABLE}" info --xml "${dir}"
OUTPUT_VARIABLE ${variable}
OUTPUT_STRIP_TRAILING_WHITESPACE)
OUTPUT_STRIP_TRAILING_WHITESPACE
RESULT_VARIABLE svn_error)
if(svn_error)
execute_process(COMMAND "${SVN_EXECUTABLE}" info --xml "${dir_cygpath}"
OUTPUT_VARIABLE ${variable}
OUTPUT_STRIP_TRAILING_WHITESPACE)
endif()
string(REGEX REPLACE ".*<url>([^<]+)</url>.*" "\\1" ${variable} "${${variable}}")
if(NOT variable)
message("Warning: can not get the Subversion URL of directory ${dir}")

11
Installation/CMakeLists.txt
View File

@ -134,10 +134,19 @@ if ( CGAL_BRANCH_BUILD )
if ( ${CGAL_SCM_NAME} STREQUAL "svn" )
function(Subversion_GET_REVISION dir variable)
execute_process(COMMAND cygpath "${dir}"
OUTPUT_VARIABLE dir_cygpath
RESULT_VARIABLE cygpath_error)
# use svnversion
execute_process(COMMAND "${SVN_EXECUTABLE}" info --xml "${dir}"
OUTPUT_VARIABLE ${variable}
OUTPUT_STRIP_TRAILING_WHITESPACE)
OUTPUT_STRIP_TRAILING_WHITESPACE
RESULT_VARIABLE svn_error)
if(svn_error)
execute_process(COMMAND "${SVN_EXECUTABLE}" info --xml "${dir_cygpath}"
OUTPUT_VARIABLE ${variable}
OUTPUT_STRIP_TRAILING_WHITESPACE)
endif()
string(REGEX REPLACE "^(.*\n)? revision=\"([^\n]+)\".*url.*" "\\2" ${variable} "${${variable}}")
if(NOT variable)
message("Warning: can not get the Subversion revision of directory ${dir}")

6
Mesh_2/include/CGAL/Mesh_2/Refine_edges.h
View File

@ -421,6 +421,12 @@ public:
zone.fh = triangulation_ref_impl().locate(p, zone.locate_type, zone.i, edge.first);
const Face_handle n = f->neighbor(i);
CGAL_assertion_msg(zone.locate_type != Tr::FACE ||
zone.fh == f || zone.fh == n,
"Your data set contains at least a vertex that is "
"very close to \n"
" a constrained edge! "
"Mesh_2 cannot mesh that sort of data set.");
const bool f_does_conflict = (zone.locate_type == Tr::EDGE) ||
triangulation_ref_impl().test_conflict(p, f);