Merge pull request #719 from afabri/NewKernelD-not_on_gcc4.1-GF

Do not perform the test for g++ <= 4.2

NewKernel_d/test/NewKernel_d/Epick_d.cpp

@@ -1,3 +1,13 @@
+#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4)
+
+#include <iostream>
+int main()
+{
+  std::cerr << "NOTICE: This test requires G++ >= 4.4, and will not be compiled." << std::endl;
+}
+
+#else
+
 //#define BOOST_RESULT_OF_USE_DECLTYPE 1
 #include <CGAL/Epick_d.h>
 #include <typeinfo>
@@ -600,3 +610,5 @@ int main(){
   test3<Ker3>();
   test3<Kerd>();
 }
+
+#endif

NewKernel_d/test/NewKernel_d/Makefile

@@ -1,17 +0,0 @@
-all: normal cxx11
-
-CXX = g++
-
-CGAL_INC = -I. -I../../include -I../../../Algebraic_foundations/include -I../../../STL_Extension/include -I../../../Number_types/include -I../../../Kernel_23/include -I../../../Installation/include -DCGAL_DISABLE_ROUNDING_MATH_CHECK
-
-EIGEN_INC = `pkg-config --cflags eigen3|sed -e 's/-I/-isystem/g'` -DCGAL_EIGEN3_ENABLED
-
-normal:
-	${CXX} Epick_d.cpp -O2 -lCGAL -lboost_thread -frounding-math -Wall -Wextra -lmpfr -lgmp ${CGAL_INC} ${EIGEN_INC}
-	./a.out
-
-cxx11:
-	${CXX} -std=c++0x -O2 Epick_d.cpp -lCGAL -lboost_thread -frounding-math -Wall -Wextra -lmpfr -lgmp ${CGAL_INC} ${EIGEN_INC} -o b.out
-	./b.out
-
-#-DBOOST_RESULT_OF_USE_DECLTYPE 

Triangulation/examples/Triangulation/delaunay_triangulation.cpp

@@ -1,3 +1,13 @@
+#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4)
+
+#include <iostream>
+int main()
+{
+  std::cerr << "NOTICE: This test requires G++ >= 4.4, and will not be compiled." << std::endl;
+}
+
+#else
+
 #include <CGAL/Epick_d.h>
 #include <CGAL/point_generators_d.h>
 #include <CGAL/Delaunay_triangulation.h>
@@ -64,3 +74,5 @@ int main(int argc, char **argv)
   std::cout << " done in "<<cost.time()<<" seconds." << std::endl;
   return 0;
 }
+
+#endif

Triangulation/examples/Triangulation/triangulation.cpp

@@ -1,3 +1,13 @@
+#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4)
+
+#include <iostream>
+int main()
+{
+  std::cerr << "NOTICE: This test requires G++ >= 4.4, and will not be compiled." << std::endl;
+}
+
+#else
+
 #include <CGAL/Epick_d.h>
 #include <CGAL/point_generators_d.h>
 #include <CGAL/Triangulation.h>
@@ -39,3 +49,5 @@ int main()
 
     return 0;
 }
+
+#endif

Triangulation/test/Triangulation/test_delaunay.cpp

@@ -1,3 +1,13 @@
+#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4)
+
+#include <iostream>
+int main()
+{
+  std::cerr << "NOTICE: This test requires G++ >= 4.4, and will not be compiled." << std::endl;
+}
+
+#else
+
 #include <CGAL/Epick_d.h>
 #include <CGAL/point_generators_d.h>
 #include <CGAL/Delaunay_triangulation.h>
@@ -124,3 +134,5 @@ int main(int argc, char **argv)
     cerr << endl;
     return 0;
 }
+
+#endif

Triangulation/test/Triangulation/test_torture.cpp

@@ -1,3 +1,13 @@
+#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4)
+
+#include <iostream>
+int main()
+{
+  std::cerr << "NOTICE: This test requires G++ >= 4.4, and will not be compiled." << std::endl;
+}
+
+#else
+
 #include <CGAL/Epick_d.h>
 #include <CGAL/internal/Combination_enumerator.h>
 #include <CGAL/point_generators_d.h>
@@ -144,3 +154,5 @@ int main(int argc, char **argv)
     cout << std::endl;
     return 0;
 }
+
+#endif

Triangulation/test/Triangulation/test_triangulation.cpp

@@ -1,3 +1,13 @@
+#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4)
+
+#include <iostream>
+int main()
+{
+  std::cerr << "NOTICE: This test requires G++ >= 4.4, and will not be compiled." << std::endl;
+}
+
+#else
+
 #include <CGAL/Epick_d.h>
 #include <CGAL/point_generators_d.h>
 #include <CGAL/Triangulation.h>
@@ -122,3 +132,5 @@ int main(int argc, char **argv)
     cerr << std::endl;
     return 0;
 }
+
+#endif