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

Revert last commit (commited by error)

This commit is contained in:
Laurent Rineau 2012-10-09 09:28:37 +00:00
parent 648472bdac
commit f0118a1311
7 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Installation/CMakeLists.txt
View File

@ -988,9 +988,9 @@ You must disable CGAL_ENABLE_CHECK_HEADERS.")
foreach (package ${CGAL_CONFIGURED_PACKAGES_NAMES}) foreach (package ${CGAL_CONFIGURED_PACKAGES_NAMES})
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../${package}/include) if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../${package}/include)
set(depends "") set(depends "")
file(GLOB ${package}_HEADERS file(GLOB_RECURSE ${package}_HEADERS
RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/../${package}/include" RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/../${package}/include"
"${CMAKE_CURRENT_SOURCE_DIR}/../${package}/include/CGAL/*.h") "${CMAKE_CURRENT_SOURCE_DIR}/../${package}/include/*.h")
foreach(header ${${package}_HEADERS}) foreach(header ${${package}_HEADERS})
string(REPLACE "/" "__" header2 "${header}") string(REPLACE "/" "__" header2 "${header}")
string(REPLACE "." "_" header2 "${header2}") string(REPLACE "." "_" header2 "${header2}")

4
Intersections_2/test/Intersections_2/test_intersections_2.cpp
View File

@ -21,6 +21,10 @@
#include <iostream> #include <iostream>
#include <cassert> #include <cassert>
#ifdef NDEBUG
# error The test-suite needs no NDEBUG defined
#endif
const double epsilon = 0.001; const double epsilon = 0.001;
struct randomint { struct randomint {

4
Intersections_3/test/Intersections_3/test_intersections_3.cpp
View File

@ -10,6 +10,10 @@
#include <iostream> #include <iostream>
#include <cassert> #include <cassert>
#ifdef NDEBUG
# error The test-suite needs no NDEBUG defined
#endif
const double epsilon = 0.001; const double epsilon = 0.001;
struct randomint { struct randomint {

4
Mesh_3/include/CGAL/Mesh_3/dihedral_angle_3.h
View File

@ -57,8 +57,8 @@ dihedral_angle(const typename K::Point_3& a,
const Vector_3 abad = cross_product(ab,ad); const Vector_3 abad = cross_product(ab,ad);
const double x = CGAL::to_double(scalar_product(cross_product(ab,ac), abad)); const double x = CGAL::to_double(scalar_product(cross_product(ab,ac), abad));
const double l_ab = CGAL::sqrt(CGAL::to_double(sq_distance(a,b))); const FT l_ab = CGAL::sqrt(sq_distance(a,b));
const double y = l_ab * CGAL::to_double(scalar_product(ac,abad)); const double y = CGAL::to_double(l_ab * scalar_product(ac,abad));
return FT(std::atan2(y, x) * 180 / CGAL_PI ); return FT(std::atan2(y, x) * 180 / CGAL_PI );
} }

2
Scripts/developer_scripts/cgal_test_with_cmake
View File

@ -13,6 +13,4 @@ fi
[ ! -x cgal_test_with_cmake ] && echo "No cgal_test_with_cmake in current directory, creating it" && create_cgal_test_with_cmake ${in_demo} [ ! -x cgal_test_with_cmake ] && echo "No cgal_test_with_cmake in current directory, creating it" && create_cgal_test_with_cmake ${in_demo}
./cgal_test_with_cmake $@ ./cgal_test_with_cmake $@
RESULT=$?
cat error.txt cat error.txt
exit $RESULT

1
Scripts/developer_scripts/create_cgal_test
View File

@ -81,7 +81,6 @@ configure()
echo "Configuring... " echo "Configuring... "
if eval 'cmake "\$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE \\ if eval 'cmake "\$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE \\
-DCMAKE_BUILD_TYPE=Debug \\
-DCGAL_DIR="\$CGAL_DIR" \\ -DCGAL_DIR="\$CGAL_DIR" \\
.' ; then .' ; then