From c85b24f7e0c489093e0c5ccca934eb53fafab623 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Thu, 4 Feb 2016 16:11:42 +0000
Subject: CMake strategy modification

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/Win64_Boost_Xunit_fix@1003 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: c917934525e020b54b2f4506b5c9d060a28c9d89
---
 data/points/generator/CMakeLists.txt | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'data/points/generator')

diff --git a/data/points/generator/CMakeLists.txt b/data/points/generator/CMakeLists.txt
index 26b44446..c01a380d 100644
--- a/data/points/generator/CMakeLists.txt
+++ b/data/points/generator/CMakeLists.txt
@@ -5,22 +5,6 @@ if(CGAL_FOUND)
   if (NOT CGAL_VERSION VERSION_LESS 4.6.0)
     message(STATUS "CGAL version: ${CGAL_VERSION}.")
 
-    include( ${CGAL_USE_FILE} )
-    # In CMakeLists.txt, when include(${CGAL_USE_FILE}), CXX_FLAGS are overwritten.
-    # cf. http://doc.cgal.org/latest/Manual/installation.html#title40
-    # A workaround is to add "-std=c++11" again.
-    # A fix would be to use https://cmake.org/cmake/help/v3.1/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.html 
-    # or even better https://cmake.org/cmake/help/v3.1/variable/CMAKE_CXX_STANDARD.html
-    # but it implies to use cmake version 3.1 at least.
-    if(NOT MSVC)
-      include(CheckCXXCompilerFlag)
-      CHECK_CXX_COMPILER_FLAG(-std=c++11 COMPILER_SUPPORTS_CXX11)
-      if(COMPILER_SUPPORTS_CXX11)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-      endif()
-    endif()
-    # - End of workaround
-
     find_package(Eigen3 3.1.0)
     if (EIGEN3_FOUND)
       include( ${EIGEN3_USE_FILE} )
-- 
cgit v1.2.3


From 07b4360422ddeac4a7f577cc61eb368e1c7237d7 Mon Sep 17 00:00:00 2001
From: cjamin <cjamin@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Tue, 24 May 2016 09:03:51 +0000
Subject: Add Aurélien Alvarez's generator
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@1189 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 5fe81e09f9f5efe8ea50ac34d9c012c70283a3e6
---
 data/points/generator/README                       | 20 ++++-
 .../generator/aurelien_alvarez_surfaces_in_R8.py   | 90 ++++++++++++++++++++++
 2 files changed, 109 insertions(+), 1 deletion(-)
 create mode 100755 data/points/generator/aurelien_alvarez_surfaces_in_R8.py

(limited to 'data/points/generator')

diff --git a/data/points/generator/README b/data/points/generator/README
index e6b28eb0..41cb9165 100644
--- a/data/points/generator/README
+++ b/data/points/generator/README
@@ -1,10 +1,13 @@
-To build the example, run in a Terminal:
+=========================== C++ generators =====================================
+
+To build the C++ generators, run in a Terminal:
 
 cd /path-to-gudhi/
 cmake .
 cd /path-to-data-generator/
 make
 
+=========================== hypergenerator =====================================
 
 Example of use :
 
@@ -24,3 +27,18 @@ Example of use :
 
 !! Warning: hypegenerator on cube is not available !!
 
+===================== aurelien_alvarez_surfaces_in_R8 ==========================
+
+This generator is written in Python.
+
+This code generates points on a family of surfaces living in CP^2. You can move
+in the family thanks to the parameter "degre". The parameter "nombrePoints"
+allows to choose the number of points on the chosen surface. Finally, to compute
+the points, we choose a chart in C^2 and take points randomly in the x-variable,
+so that you may also modify the window for x in the complex plane (parameter
+"module_x").
+
+After that, the program computes points in C^2, then maps them in R^8, so that
+the points live on a surface which is compact (which is not the case for the
+intersection of the surface with C^2). We end off with a bunch of points on a
+compact surface in R^8.
diff --git a/data/points/generator/aurelien_alvarez_surfaces_in_R8.py b/data/points/generator/aurelien_alvarez_surfaces_in_R8.py
new file mode 100755
index 00000000..57773c4c
--- /dev/null
+++ b/data/points/generator/aurelien_alvarez_surfaces_in_R8.py
@@ -0,0 +1,90 @@
+#   This file is part of the Gudhi Library. The Gudhi library
+#   (Geometric Understanding in Higher Dimensions) is a generic C++
+#   library for computational topology.
+#  
+#   Author(s):       Aurélien Alvarez
+#  
+#   Copyright (C) 2016  Université d'Orléans (France)
+#  
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#  
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#  
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import numpy as np
+import random
+from math import factorial
+
+I = complex(0,1)
+
+#################################################
+#################################################
+
+#Surface réelle d'équation x.conj(y)^d + y.conj(z)^d + z.conj(x)^d = 0 dans P2(C)
+#Équation affine (z=1) multipliée par sa conjuguée (d = 2) : x.conj(x)^2.y^4 + 2x^3.conj(x).y^2 + y + conj(x)^2 + x^5 = 0
+def equationAffineSurfaceReelle(x):
+    polynome = [0]*(degre**2+1)
+    for k in range(degre+1):
+        polynome[k*degre] = (-1)**degre*x*factorial(degre)/(factorial(k)*factorial(degre-k))*x**(k*degre)*np.conjugate(x)**(degre-k)
+    polynome[-2] += 1
+    polynome[-1] += np.conjugate(x)**degre
+    return polynome
+
+#################################################
+#################################################
+
+def calculRacines(equation,nombrePoints,module_x):
+    racines = [[1,0,0],[0,1,0],[0,0,1]]
+    for _ in range(nombrePoints):
+        x = module_x*(2*random.random()-1+I*(2*random.random()-1))
+        fool = [[[x,y,1],[y,1,x],[1,x,y]] for y in np.roots(equation(x)) if abs(x*np.conjugate(y)**degre+y+np.conjugate(x)**degre) < 0.0001]
+        for bar in fool:
+            racines += bar
+    return racines
+
+#################################################
+#################################################
+
+def plongementDansR8(pointDansCP2):
+    z0 = pointDansCP2[0]
+    z1 = pointDansCP2[1]
+    z2 = pointDansCP2[2]
+    a = z0*np.conjugate(z0)
+    b = z1*np.conjugate(z1)
+    c = z2*np.conjugate(z2)
+    normeCarree = a+b+c
+    a = a/normeCarree
+    b = b/normeCarree
+    u = z0*np.conjugate(z1)/normeCarree
+    v = z0*np.conjugate(z2)/normeCarree
+    w = z1*np.conjugate(z2)/normeCarree
+    return [a.real,b.real,u.real,u.imag,v.real,v.imag,w.real,w.imag]
+
+def plongementListeDansR8(listePointsDansCP2):
+    listePointsDansR8 = []
+    for point in listePointsDansCP2:
+        listePointsDansR8 += [plongementDansR8(point)]
+    return listePointsDansR8
+
+#################################################
+#################################################
+
+degre = 3
+nombrePoints = 10**4
+module_x = 10
+
+with open("surface.txt","w") as fichier: 
+    bar = calculRacines(equationAffineSurfaceReelle,nombrePoints,module_x)
+    listePoints = plongementListeDansR8(bar)
+    fichier.write(str(len(bar)) + "\n")
+    for point in listePoints:
+        fichier.write(str(point[0]) + " " + str(point[1]) + " " + str(point[2]) + " " + str(point[3]) + " " + str(point[4]) + " " + str(point[5]) + " " + str(point[6]) + " " + str(point[7]) + "\n")
+
-- 
cgit v1.2.3


From 2ecd97ff50b01f864944443b3a2a8ea0220d9b10 Mon Sep 17 00:00:00 2001
From: cjamin <cjamin@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Fri, 10 Jun 2016 10:49:06 +0000
Subject: Missing link with Boost System

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@1270 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 70e3dfb20af1a0b4f048f56fff0c85dbbde3f530
---
 data/points/generator/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'data/points/generator')

diff --git a/data/points/generator/CMakeLists.txt b/data/points/generator/CMakeLists.txt
index c01a380d..f892aa50 100644
--- a/data/points/generator/CMakeLists.txt
+++ b/data/points/generator/CMakeLists.txt
@@ -9,8 +9,9 @@ if(CGAL_FOUND)
     if (EIGEN3_FOUND)
       include( ${EIGEN3_USE_FILE} )
       include_directories (BEFORE "../../include")
-
+	  
       add_executable ( hypergenerator hypergenerator.cpp )
+      target_link_libraries(hypergenerator ${Boost_SYSTEM_LIBRARY})
       add_test(hypergenerator_on_sphere_3000_10_5.0 ${CMAKE_CURRENT_BINARY_DIR}/hypergenerator on sphere onSphere.off 3000 10 5.0)
       add_test(hypergenerator_on_sphere_10000_3 ${CMAKE_CURRENT_BINARY_DIR}/hypergenerator on sphere onSphere.off 10000 3)
       add_test(hypergenerator_in_sphere_7000_12_10.8 ${CMAKE_CURRENT_BINARY_DIR}/hypergenerator in sphere inSphere.off 7000 12 10.8)
-- 
cgit v1.2.3


From 0ba8c838da6c82e9ff26e787e32057c803996b40 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Tue, 14 Jun 2016 09:28:33 +0000
Subject: data points generator to follow convention naming Alpha_complex
 instead of Alpha_shape

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/fix_naming@1278 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 680d599dce4b87a570083ac16c6574166d7af47d
---
 data/points/generator/CMakeLists.txt     | 2 +-
 src/Alpha_complex/example/CMakeLists.txt | 2 +-
 src/Alpha_complex/test/CMakeLists.txt    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'data/points/generator')

diff --git a/data/points/generator/CMakeLists.txt b/data/points/generator/CMakeLists.txt
index f892aa50..13fb84fd 100644
--- a/data/points/generator/CMakeLists.txt
+++ b/data/points/generator/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.6)
-project(GUDHIPointsGenerator)
+project(Data_points_generator)
 
 if(CGAL_FOUND)
   if (NOT CGAL_VERSION VERSION_LESS 4.6.0)
diff --git a/src/Alpha_complex/example/CMakeLists.txt b/src/Alpha_complex/example/CMakeLists.txt
index b828746c..c0ecf0d1 100644
--- a/src/Alpha_complex/example/CMakeLists.txt
+++ b/src/Alpha_complex/example/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.6)
-project(Alpha_shapes_examples)
+project(Alpha_complex_examples)
 
 # need CGAL 4.7
 # cmake -DCGAL_DIR=~/workspace/CGAL-4.7-Ic-41 ../../..
diff --git a/src/Alpha_complex/test/CMakeLists.txt b/src/Alpha_complex/test/CMakeLists.txt
index 7aba3a16..dae0d45f 100644
--- a/src/Alpha_complex/test/CMakeLists.txt
+++ b/src/Alpha_complex/test/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.6)
-project(Alpha_shapes_tests)
+project(Alpha_complex_tests)
 
 if (GCOVR_PATH)
   # for gcovr to make coverage reports - Corbera Jenkins plugin
-- 
cgit v1.2.3


From 2ef73a660a093b8350edea9474e887cd6792f8e8 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Fri, 1 Jul 2016 09:26:36 +0000
Subject: Eigen3 find_package factorization CGAL find package in root
 CMakeLists.txt for Witness complex

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/eigen3_cmake_factorization@1377 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 32137f7687837c63ecfab3a2d11114b27873a1f2
---
 CMakeLists.txt                                   | 18 ++++--
 data/points/generator/CMakeLists.txt             |  6 --
 src/Alpha_complex/example/CMakeLists.txt         | 10 +---
 src/Alpha_complex/test/CMakeLists.txt            | 11 +---
 src/CMakeLists.txt                               | 10 ++++
 src/Persistent_cohomology/example/CMakeLists.txt | 71 ++++++++++--------------
 src/Witness_complex/example/CMakeLists.txt       | 24 --------
 src/common/example/CMakeLists.txt                |  9 +--
 src/common/test/CMakeLists.txt                   |  8 +--
 9 files changed, 62 insertions(+), 105 deletions(-)

(limited to 'data/points/generator')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e85be8a..1d151455 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,9 +20,11 @@ else()
 
   find_package(GMP)
   if(GMP_FOUND)
+    message(STATUS "GMP_LIBRARIES = ${GMP_LIBRARIES}")
     INCLUDE_DIRECTORIES(${GMP_INCLUDE_DIR})
     find_package(GMPXX)
     if(GMPXX_FOUND)
+      message(STATUS "GMPXX_LIBRARIES = ${GMPXX_LIBRARIES}")
       INCLUDE_DIRECTORIES(${GMPXX_INCLUDE_DIR})
     endif()
   endif()
@@ -40,6 +42,7 @@ else()
     unset(CGAL_FOUND)
   endif()
   if(CGAL_FOUND)
+    message(STATUS "CGAL version: ${CGAL_VERSION}.")
     include( ${CGAL_USE_FILE} )
   endif()
   
@@ -69,6 +72,13 @@ else()
     add_definitions(-DGUDHI_USE_TBB)
   endif()
 
+  find_package(Eigen3 3.1.0)
+  if (EIGEN3_FOUND)
+    message(STATUS "Eigen3 version: ${EIGEN3_VERSION}.")
+    include( ${EIGEN3_USE_FILE} )
+    #include_directories (BEFORE "../../include")
+  endif (EIGEN3_FOUND)
+
   # Required programs for unitary tests purpose
   FIND_PROGRAM( GCOVR_PATH gcovr )
   if (GCOVR_PATH)
@@ -79,10 +89,10 @@ else()
   if (GPROF_PATH)
     message("gprof found in ${GPROF_PATH}")
   endif()
-FIND_PROGRAM( DIFF_PATH diff )
-if (DIFF_PATH)
-  message("diff found in ${DIFF_PATH}")
-endif()
+  FIND_PROGRAM( DIFF_PATH diff )
+  if (DIFF_PATH)
+    message("diff found in ${DIFF_PATH}")
+  endif()
 
   # BOOST ISSUE result_of vs C++11
   add_definitions(-DBOOST_RESULT_OF_USE_DECLTYPE)
diff --git a/data/points/generator/CMakeLists.txt b/data/points/generator/CMakeLists.txt
index 13fb84fd..e29eb19c 100644
--- a/data/points/generator/CMakeLists.txt
+++ b/data/points/generator/CMakeLists.txt
@@ -3,13 +3,7 @@ project(Data_points_generator)
 
 if(CGAL_FOUND)
   if (NOT CGAL_VERSION VERSION_LESS 4.6.0)
-    message(STATUS "CGAL version: ${CGAL_VERSION}.")
-
-    find_package(Eigen3 3.1.0)
     if (EIGEN3_FOUND)
-      include( ${EIGEN3_USE_FILE} )
-      include_directories (BEFORE "../../include")
-	  
       add_executable ( hypergenerator hypergenerator.cpp )
       target_link_libraries(hypergenerator ${Boost_SYSTEM_LIBRARY})
       add_test(hypergenerator_on_sphere_3000_10_5.0 ${CMAKE_CURRENT_BINARY_DIR}/hypergenerator on sphere onSphere.off 3000 10 5.0)
diff --git a/src/Alpha_complex/example/CMakeLists.txt b/src/Alpha_complex/example/CMakeLists.txt
index c0ecf0d1..f1c7ae97 100644
--- a/src/Alpha_complex/example/CMakeLists.txt
+++ b/src/Alpha_complex/example/CMakeLists.txt
@@ -5,13 +5,7 @@ project(Alpha_complex_examples)
 # cmake -DCGAL_DIR=~/workspace/CGAL-4.7-Ic-41 ../../..
 if(CGAL_FOUND)
   if (NOT CGAL_VERSION VERSION_LESS 4.7.0)
-    message(STATUS "CGAL version: ${CGAL_VERSION}.")
-
-    find_package(Eigen3 3.1.0)
     if (EIGEN3_FOUND)
-      message(STATUS "Eigen3 version: ${EIGEN3_VERSION}.")
-      include( ${EIGEN3_USE_FILE} )
-
       add_executable ( alphapoints Alpha_complex_from_points.cpp )
       target_link_libraries(alphapoints  ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY} ${CGAL_LIBRARY})
       add_executable ( alphaoffreader Alpha_complex_from_off.cpp )
@@ -35,9 +29,9 @@ if(CGAL_FOUND)
         add_test(alphaoffreader_doc_32_diff_files ${DIFF_PATH} ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_result_32.txt ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_for_doc_32.txt)
       endif()
     else()
-      message(WARNING "Eigen3 not found. Version 3.1.0 is required for Alpha shapes feature.")
+      message(WARNING "Eigen3 not found. Version 3.1.0 is required for Alpha complex examples.")
     endif()
   else()
-    message(WARNING "CGAL version: ${CGAL_VERSION} is too old to compile Alpha shapes feature. Version 4.6.0 is required.")
+    message(WARNING "CGAL version: ${CGAL_VERSION} is too old to compile Alpha complex examples. Version 4.7.0 is required.")
   endif ()
 endif()
diff --git a/src/Alpha_complex/test/CMakeLists.txt b/src/Alpha_complex/test/CMakeLists.txt
index dae0d45f..b0723a41 100644
--- a/src/Alpha_complex/test/CMakeLists.txt
+++ b/src/Alpha_complex/test/CMakeLists.txt
@@ -14,14 +14,7 @@ endif()
 # cmake -DCGAL_DIR=~/workspace/CGAL-4.7-Ic-41 ../../..
 if(CGAL_FOUND)
   if (NOT CGAL_VERSION VERSION_LESS 4.7.0)
-    message(STATUS "CGAL version: ${CGAL_VERSION}.")
-
-    find_package(Eigen3 3.1.0)
     if (EIGEN3_FOUND)
-      message(STATUS "Eigen3 version: ${EIGEN3_VERSION}.")
-      include( ${EIGEN3_USE_FILE} )
-      include_directories (BEFORE "../../include")
-
       add_executable ( AlphaComplexUT Alpha_complex_unit_test.cpp )
       target_link_libraries(AlphaComplexUT  ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY} ${CGAL_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
       if (TBB_FOUND)
@@ -36,10 +29,10 @@ if(CGAL_FOUND)
       --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/AlphaComplexUT.xml --log_level=test_suite --report_level=no)
 
     else()
-      message(WARNING "Eigen3 not found. Version 3.1.0 is required for Alpha complex feature.")
+      message(WARNING "Eigen3 not found. Version 3.1.0 is required for Alpha complex unitary tests.")
     endif()
   else()
-    message(WARNING "CGAL version: ${CGAL_VERSION} is too old to compile Alpha complex feature. Version 4.6.0 is required.")
+    message(WARNING "CGAL version: ${CGAL_VERSION} is too old to compile Alpha complex unitary tests. Version 4.7.0 is required.")
   endif ()
 endif()
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e55e4395..80f6e1ff 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,9 +17,11 @@ else()
 
   find_package(GMP)
   if(GMP_FOUND)
+    message(STATUS "GMP_LIBRARIES = ${GMP_LIBRARIES}")
     INCLUDE_DIRECTORIES(${GMP_INCLUDE_DIR})
     find_package(GMPXX)
     if(GMPXX_FOUND)
+      message(STATUS "GMPXX_LIBRARIES = ${GMPXX_LIBRARIES}")
       INCLUDE_DIRECTORIES(${GMPXX_INCLUDE_DIR})
     endif()
   endif()
@@ -37,6 +39,7 @@ else()
     unset(CGAL_FOUND)
   endif()
   if(CGAL_FOUND)
+    message(STATUS "CGAL version: ${CGAL_VERSION}.")
     include( ${CGAL_USE_FILE} )
   endif()
   
@@ -66,6 +69,13 @@ else()
     add_definitions(-DGUDHI_USE_TBB)
   endif()
 
+  find_package(Eigen3 3.1.0)
+  if (EIGEN3_FOUND)
+    message(STATUS "Eigen3 version: ${EIGEN3_VERSION}.")
+    include( ${EIGEN3_USE_FILE} )
+    #include_directories (BEFORE "../../include")
+  endif (EIGEN3_FOUND)
+
   # BOOST ISSUE result_of vs C++11
   add_definitions(-DBOOST_RESULT_OF_USE_DECLTYPE)
   # BOOST ISSUE with Libraries name resolution under Windows
diff --git a/src/Persistent_cohomology/example/CMakeLists.txt b/src/Persistent_cohomology/example/CMakeLists.txt
index 5fb4ba12..94b9fbfa 100644
--- a/src/Persistent_cohomology/example/CMakeLists.txt
+++ b/src/Persistent_cohomology/example/CMakeLists.txt
@@ -36,11 +36,7 @@ add_test(persistence_from_file_3_2_0 ${CMAKE_CURRENT_BINARY_DIR}/persistence_fro
 add_test(persistence_from_file_3_3_100 ${CMAKE_CURRENT_BINARY_DIR}/persistence_from_file ${CMAKE_SOURCE_DIR}/data/points/bunny_5000.st -p 3 -m 100)
    
 if(GMP_FOUND)
-   message("GMP_LIBRARIES = ${GMP_LIBRARIES}")
-
    if(GMPXX_FOUND)
-      message("GMPXX_LIBRARIES = ${GMPXX_LIBRARIES}")
-
       add_executable(rips_multifield_persistence rips_multifield_persistence.cpp )
       target_link_libraries(rips_multifield_persistence ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${GMPXX_LIBRARIES} ${GMP_LIBRARIES})
       add_executable ( performance_rips_persistence performance_rips_persistence.cpp )
@@ -56,49 +52,42 @@ else()
   # message(WARNING "GMP not found.")
 endif(GMP_FOUND)
 
-  if(CGAL_FOUND)
-    add_executable(alpha_complex_3d_persistence alpha_complex_3d_persistence.cpp)
-    target_link_libraries(alpha_complex_3d_persistence ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY})
-
-    if (TBB_FOUND)
-      target_link_libraries(alpha_complex_3d_persistence ${TBB_LIBRARIES})
-    endif(TBB_FOUND)
-    add_test(alpha_complex_3d_persistence_2_0_5 ${CMAKE_CURRENT_BINARY_DIR}/alpha_complex_3d_persistence ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off 2 0.45)
-
+if(CGAL_FOUND)
+  add_executable(alpha_complex_3d_persistence alpha_complex_3d_persistence.cpp)
+  target_link_libraries(alpha_complex_3d_persistence ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY})
 
-    if (NOT CGAL_VERSION VERSION_LESS 4.7.0)
-      message(STATUS "CGAL version: ${CGAL_VERSION}.")
+  if (TBB_FOUND)
+    target_link_libraries(alpha_complex_3d_persistence ${TBB_LIBRARIES})
+  endif(TBB_FOUND)
+  add_test(alpha_complex_3d_persistence_2_0_5 ${CMAKE_CURRENT_BINARY_DIR}/alpha_complex_3d_persistence ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off 2 0.45)
 
-      find_package(Eigen3 3.1.0)
-      if (EIGEN3_FOUND)
-        message(STATUS "Eigen3 version: ${EIGEN3_VERSION}.")
-        include( ${EIGEN3_USE_FILE} )
 
-        add_executable (alpha_complex_persistence alpha_complex_persistence.cpp)
-        target_link_libraries(alpha_complex_persistence  ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
+  if (NOT CGAL_VERSION VERSION_LESS 4.7.0)
+    if (EIGEN3_FOUND)
+      add_executable (alpha_complex_persistence alpha_complex_persistence.cpp)
+      target_link_libraries(alpha_complex_persistence  ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
 
-        add_executable(periodic_alpha_complex_3d_persistence periodic_alpha_complex_3d_persistence.cpp)
-        target_link_libraries(periodic_alpha_complex_3d_persistence ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY})
+      add_executable(periodic_alpha_complex_3d_persistence periodic_alpha_complex_3d_persistence.cpp)
+      target_link_libraries(periodic_alpha_complex_3d_persistence ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY})
 
-        add_executable(custom_persistence_sort custom_persistence_sort.cpp)
-        target_link_libraries(custom_persistence_sort ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY})
+      add_executable(custom_persistence_sort custom_persistence_sort.cpp)
+      target_link_libraries(custom_persistence_sort ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY})
 
-        if (TBB_FOUND)
-          target_link_libraries(alpha_complex_persistence ${TBB_LIBRARIES})
-          target_link_libraries(periodic_alpha_complex_3d_persistence ${TBB_LIBRARIES})
-          target_link_libraries(custom_persistence_sort ${TBB_LIBRARIES})
-        endif(TBB_FOUND)
-        add_test(alpha_complex_persistence_2_0_45 ${CMAKE_CURRENT_BINARY_DIR}/alpha_complex_persistence ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -m 0.45 -p 2)
-        add_test(periodic_alpha_complex_3d_persistence_2_0 ${CMAKE_CURRENT_BINARY_DIR}/periodic_alpha_complex_3d_persistence ${CMAKE_SOURCE_DIR}/data/points/grid_10_10_10_in_0_1.off ${CMAKE_SOURCE_DIR}/data/points/iso_cuboid_3_in_0_1.txt 2 0)
-        add_test(custom_persistence_sort ${CMAKE_CURRENT_BINARY_DIR}/custom_persistence_sort)
+      if (TBB_FOUND)
+        target_link_libraries(alpha_complex_persistence ${TBB_LIBRARIES})
+        target_link_libraries(periodic_alpha_complex_3d_persistence ${TBB_LIBRARIES})
+        target_link_libraries(custom_persistence_sort ${TBB_LIBRARIES})
+      endif(TBB_FOUND)
+      add_test(alpha_complex_persistence_2_0_45 ${CMAKE_CURRENT_BINARY_DIR}/alpha_complex_persistence ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -m 0.45 -p 2)
+      add_test(periodic_alpha_complex_3d_persistence_2_0 ${CMAKE_CURRENT_BINARY_DIR}/periodic_alpha_complex_3d_persistence ${CMAKE_SOURCE_DIR}/data/points/grid_10_10_10_in_0_1.off ${CMAKE_SOURCE_DIR}/data/points/iso_cuboid_3_in_0_1.txt 2 0)
+      add_test(custom_persistence_sort ${CMAKE_CURRENT_BINARY_DIR}/custom_persistence_sort)
 
-      else()
-        message(WARNING "Eigen3 not found. Version 3.1.0 is required for Alpha shapes feature.")
-      endif(EIGEN3_FOUND)
     else()
-      message(WARNING "CGAL version: ${CGAL_VERSION} is too old to compile Alpha shapes feature. Version 4.6.0 is required.")
-    endif ()
+      message(WARNING "Eigen3 not found. Version 3.1.0 is required for Alpha complex persistence examples.")
+    endif(EIGEN3_FOUND)
   else()
-    # message(WARNING "CGAL not found.")
-  endif(CGAL_FOUND)
-   
+    message(WARNING "CGAL version: ${CGAL_VERSION} is too old to compile Alpha complex persistence examples. Version 4.7.0 is required.")
+  endif ()
+else()
+  # message(WARNING "CGAL not found.")
+endif(CGAL_FOUND)
diff --git a/src/Witness_complex/example/CMakeLists.txt b/src/Witness_complex/example/CMakeLists.txt
index e6a916cd..48ba9279 100644
--- a/src/Witness_complex/example/CMakeLists.txt
+++ b/src/Witness_complex/example/CMakeLists.txt
@@ -7,31 +7,7 @@ project(Witness_complex_examples)
 
 if(CGAL_FOUND)
   if (NOT CGAL_VERSION VERSION_LESS 4.6.0)
-    message(STATUS "CGAL version: ${CGAL_VERSION}.")
-
-    include( ${CGAL_USE_FILE} )
-    # In CMakeLists.txt, when include(${CGAL_USE_FILE}), CXX_FLAGS are overwritten.
-    # cf. http://doc.cgal.org/latest/Manual/installation.html#title40
-    # A workaround is to add "-std=c++11" again.
-    # A fix would be to use https://cmake.org/cmake/help/v3.1/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.html 
-    # or even better https://cmake.org/cmake/help/v3.1/variable/CMAKE_CXX_STANDARD.html
-    # but it implies to use cmake version 3.1 at least.
-    if(NOT MSVC)
-      include(CheckCXXCompilerFlag)
-      CHECK_CXX_COMPILER_FLAG(-std=c++11 COMPILER_SUPPORTS_CXX11)
-      if(COMPILER_SUPPORTS_CXX11)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-      endif()
-    endif()
-    # - End of workaround
-
-    find_package(Eigen3 3.1.0)
     if (EIGEN3_FOUND)
-      message(STATUS "Eigen3 version: ${EIGEN3_VERSION}.")
-      include( ${EIGEN3_USE_FILE} )
-      message(STATUS "Eigen3 use file: ${EIGEN3_USE_FILE}.")
-      include_directories (BEFORE "../../include")
-
       add_executable ( witness_complex_sphere witness_complex_sphere.cpp )
       target_link_libraries(witness_complex_sphere ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY})
       add_test( witness_complex_sphere_10 ${CMAKE_CURRENT_BINARY_DIR}/witness_complex_sphere 10)   
diff --git a/src/common/example/CMakeLists.txt b/src/common/example/CMakeLists.txt
index 59ee12c4..4ea8c9cb 100644
--- a/src/common/example/CMakeLists.txt
+++ b/src/common/example/CMakeLists.txt
@@ -8,19 +8,14 @@ if(CGAL_FOUND)
   add_test(cgal3Doffreader ${CMAKE_CURRENT_BINARY_DIR}/cgal3Doffreader ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off)
 
   if (NOT CGAL_VERSION VERSION_LESS 4.7.0)
-    find_package(Eigen3 3.1.0)
     if (EIGEN3_FOUND)
-      message(STATUS "Eigen3 version: ${EIGEN3_VERSION}.")
-      include( ${EIGEN3_USE_FILE} )
-      
       add_executable ( cgaloffreader CGAL_points_off_reader.cpp )
       target_link_libraries(cgaloffreader  ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY})
       add_test(cgaloffreader ${CMAKE_CURRENT_BINARY_DIR}/cgaloffreader ${CMAKE_SOURCE_DIR}/data/points/alphacomplexdoc.off)
-
     else()
-      message(WARNING "Eigen3 not found. Version 3.1.0 is required for Alpha shapes feature.")
+      message(WARNING "Eigen3 not found. Version 3.1.0 is required for cgaloffreader example.")
     endif()
   else()
-    message(WARNING "CGAL version: ${CGAL_VERSION} is too old to compile Alpha shapes feature. Version 4.6.0 is required.")
+    message(WARNING "CGAL version: ${CGAL_VERSION} is too old to compile cgaloffreader example. Version 4.7.0 is required.")
   endif ()
 endif()
diff --git a/src/common/test/CMakeLists.txt b/src/common/test/CMakeLists.txt
index 5f9c5dde..0a88cf8e 100644
--- a/src/common/test/CMakeLists.txt
+++ b/src/common/test/CMakeLists.txt
@@ -13,11 +13,7 @@ endif()
 # need CGAL 4.7
 if(CGAL_FOUND)
   if (NOT CGAL_VERSION VERSION_LESS 4.7.0)
-    find_package(Eigen3 3.1.0)
     if (EIGEN3_FOUND)
-      message(STATUS "Eigen3 version: ${EIGEN3_VERSION}.")
-      include( ${EIGEN3_USE_FILE} )
-      
       add_executable ( poffreader_UT points_off_reader_unit_test.cpp )
       target_link_libraries(poffreader_UT ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 
@@ -30,10 +26,10 @@ if(CGAL_FOUND)
       --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/poffreader_UT.xml --log_level=test_suite --report_level=no)
 
     else()
-      message(WARNING "Eigen3 not found. Version 3.1.0 is required for Alpha shapes feature.")
+      message(WARNING "Eigen3 not found. Version 3.1.0 is required for points_off_reader unitary tests.")
     endif()
   else()
-    message(WARNING "CGAL version: ${CGAL_VERSION} is too old to compile Alpha shapes feature. Version 4.6.0 is required.")
+    message(WARNING "CGAL version: ${CGAL_VERSION} is too old to compile points_off_reader unitary tests. Version 4.7.0 is required.")
   endif ()
 endif()
 
-- 
cgit v1.2.3


From c4f7417b79dfe7610a9e7b5ffbf487abfe7fa3a0 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Thu, 4 Aug 2016 15:41:38 +0000
Subject: Make GUDHI Cmake less verbose on CGAL package finding

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@1415 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 2eebce43b0f75ab1cef3a2fe6f2c1bd0b38672a9
---
 data/points/generator/CMakeLists.txt             |  8 +++-----
 src/Alpha_complex/example/CMakeLists.txt         | 10 +++-------
 src/CMakeLists.txt                               |  8 +++++---
 src/Persistent_cohomology/example/CMakeLists.txt | 11 +----------
 src/Witness_complex/example/CMakeLists.txt       |  8 ++------
 src/common/example/CMakeLists.txt                |  8 ++------
 6 files changed, 16 insertions(+), 37 deletions(-)

(limited to 'data/points/generator')

diff --git a/data/points/generator/CMakeLists.txt b/data/points/generator/CMakeLists.txt
index e29eb19c..f559610c 100644
--- a/data/points/generator/CMakeLists.txt
+++ b/data/points/generator/CMakeLists.txt
@@ -13,8 +13,6 @@ if(CGAL_FOUND)
       # on cube is not available in CGAL
       add_test(hypergenerator_in_cube_7000_12_10.8 ${CMAKE_CURRENT_BINARY_DIR}/hypergenerator in cube inCube.off 7000 12 10.8)
       add_test(hypergenerator_in_cube_50000_2 ${CMAKE_CURRENT_BINARY_DIR}/hypergenerator in cube inCube.off 50000 3)
-      endif()
-  else()
-    message(WARNING "CGAL version: ${CGAL_VERSION} is too old to compile hypergenerator. Version 4.6.0 is required.")
-  endif ()
-endif()
+      endif(EIGEN3_FOUND)
+  endif(NOT CGAL_VERSION VERSION_LESS 4.6.0)
+endif(CGAL_FOUND)
diff --git a/src/Alpha_complex/example/CMakeLists.txt b/src/Alpha_complex/example/CMakeLists.txt
index f1c7ae97..71a95d61 100644
--- a/src/Alpha_complex/example/CMakeLists.txt
+++ b/src/Alpha_complex/example/CMakeLists.txt
@@ -28,10 +28,6 @@ if(CGAL_FOUND)
         add_test(alphaoffreader_doc_60_diff_files ${DIFF_PATH} ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_result_60.txt ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_for_doc_60.txt)
         add_test(alphaoffreader_doc_32_diff_files ${DIFF_PATH} ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_result_32.txt ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_for_doc_32.txt)
       endif()
-    else()
-      message(WARNING "Eigen3 not found. Version 3.1.0 is required for Alpha complex examples.")
-    endif()
-  else()
-    message(WARNING "CGAL version: ${CGAL_VERSION} is too old to compile Alpha complex examples. Version 4.7.0 is required.")
-  endif ()
-endif()
+    endif(EIGEN3_FOUND)
+  endif(NOT CGAL_VERSION VERSION_LESS 4.7.0)
+endif(CGAL_FOUND)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 80f6e1ff..c02f816d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -32,12 +32,14 @@ else()
   # A fix would be to use https://cmake.org/cmake/help/v3.1/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.html 
   # or even better https://cmake.org/cmake/help/v3.1/variable/CMAKE_CXX_STANDARD.html
   # but it implies to use cmake version 3.1 at least.
-  find_package(CGAL)
+
+  # find CGAL in QUIET mode for cmake to be less verbose when CGAL is not found.
+  find_package(CGAL QUIET)
   # Only CGAL versions > 4.4 supports what Gudhi uses from CGAL
-  if (CGAL_VERSION VERSION_LESS 4.4.0)
+  if (CGAL_VERSION VERSION_LESS 4.4.0 AND CGAL_FOUND)
     message("CGAL version ${CGAL_VERSION} is considered too old to be used by Gudhi.")
     unset(CGAL_FOUND)
-  endif()
+  endif(CGAL_VERSION VERSION_LESS 4.4.0 AND CGAL_FOUND)
   if(CGAL_FOUND)
     message(STATUS "CGAL version: ${CGAL_VERSION}.")
     include( ${CGAL_USE_FILE} )
diff --git a/src/Persistent_cohomology/example/CMakeLists.txt b/src/Persistent_cohomology/example/CMakeLists.txt
index 94b9fbfa..d97d1b63 100644
--- a/src/Persistent_cohomology/example/CMakeLists.txt
+++ b/src/Persistent_cohomology/example/CMakeLists.txt
@@ -48,8 +48,6 @@ if(GMP_FOUND)
 
    add_test(rips_multifield_persistence_2_71 ${CMAKE_CURRENT_BINARY_DIR}/rips_multifield_persistence ${CMAKE_SOURCE_DIR}/data/points/Kl.txt -r 0.2 -d 3 -p 2 -q 71 -m 100)
    endif(GMPXX_FOUND)
-else()
-  # message(WARNING "GMP not found.")
 endif(GMP_FOUND)
 
 if(CGAL_FOUND)
@@ -81,13 +79,6 @@ if(CGAL_FOUND)
       add_test(alpha_complex_persistence_2_0_45 ${CMAKE_CURRENT_BINARY_DIR}/alpha_complex_persistence ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -m 0.45 -p 2)
       add_test(periodic_alpha_complex_3d_persistence_2_0 ${CMAKE_CURRENT_BINARY_DIR}/periodic_alpha_complex_3d_persistence ${CMAKE_SOURCE_DIR}/data/points/grid_10_10_10_in_0_1.off ${CMAKE_SOURCE_DIR}/data/points/iso_cuboid_3_in_0_1.txt 2 0)
       add_test(custom_persistence_sort ${CMAKE_CURRENT_BINARY_DIR}/custom_persistence_sort)
-
-    else()
-      message(WARNING "Eigen3 not found. Version 3.1.0 is required for Alpha complex persistence examples.")
     endif(EIGEN3_FOUND)
-  else()
-    message(WARNING "CGAL version: ${CGAL_VERSION} is too old to compile Alpha complex persistence examples. Version 4.7.0 is required.")
-  endif ()
-else()
-  # message(WARNING "CGAL not found.")
+  endif (NOT CGAL_VERSION VERSION_LESS 4.7.0)
 endif(CGAL_FOUND)
diff --git a/src/Witness_complex/example/CMakeLists.txt b/src/Witness_complex/example/CMakeLists.txt
index 48ba9279..4d67e0d0 100644
--- a/src/Witness_complex/example/CMakeLists.txt
+++ b/src/Witness_complex/example/CMakeLists.txt
@@ -11,10 +11,6 @@ if(CGAL_FOUND)
       add_executable ( witness_complex_sphere witness_complex_sphere.cpp )
       target_link_libraries(witness_complex_sphere ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY})
       add_test( witness_complex_sphere_10 ${CMAKE_CURRENT_BINARY_DIR}/witness_complex_sphere 10)   
-    else()
-      message(WARNING "Eigen3 not found. Version 3.1.0 is required for witness_complex_sphere example.")      
-    endif()
-  else()
-    message(WARNING "CGAL version: ${CGAL_VERSION} is too old to compile witness_complex_sphere example. Version 4.6.0 is required.")
-  endif ()
+    endif(EIGEN3_FOUND)
+  endif (NOT CGAL_VERSION VERSION_LESS 4.6.0)
 endif()
diff --git a/src/common/example/CMakeLists.txt b/src/common/example/CMakeLists.txt
index 4ea8c9cb..0da3dcc0 100644
--- a/src/common/example/CMakeLists.txt
+++ b/src/common/example/CMakeLists.txt
@@ -12,10 +12,6 @@ if(CGAL_FOUND)
       add_executable ( cgaloffreader CGAL_points_off_reader.cpp )
       target_link_libraries(cgaloffreader  ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY})
       add_test(cgaloffreader ${CMAKE_CURRENT_BINARY_DIR}/cgaloffreader ${CMAKE_SOURCE_DIR}/data/points/alphacomplexdoc.off)
-    else()
-      message(WARNING "Eigen3 not found. Version 3.1.0 is required for cgaloffreader example.")
-    endif()
-  else()
-    message(WARNING "CGAL version: ${CGAL_VERSION} is too old to compile cgaloffreader example. Version 4.7.0 is required.")
-  endif ()
+    endif(EIGEN3_FOUND)
+  endif (NOT CGAL_VERSION VERSION_LESS 4.7.0)
 endif()
-- 
cgit v1.2.3