From bc62d9afbb151279a9da1e082a53788d3fd0d242 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Mon, 18 Sep 2017 09:37:20 +0000
Subject: Add warning for developper version that sphinx is configured for user
 version Removes GudhUI ERROR mesages (just warnings

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

Former-commit-id: 0111272d9f6d6dc10e370360b2242eff4828611b
---
 src/GudhUI/CMakeLists.txt | 34 +++-------------------------------
 src/cython/CMakeLists.txt | 13 ++++++++++---
 2 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/src/GudhUI/CMakeLists.txt b/src/GudhUI/CMakeLists.txt
index 57861946..374195d0 100644
--- a/src/GudhUI/CMakeLists.txt
+++ b/src/GudhUI/CMakeLists.txt
@@ -5,28 +5,6 @@ find_package(Qt5 COMPONENTS Widgets Xml OpenGL)
 find_package(QGLViewer)
 find_package(OpenGL)
 
-if (CGAL_VERSION VERSION_EQUAL 4.8.0)
-  message(ERROR " GudhUI does not compile with CGAL 4.8.0. 4.8.1, 4.8.2 and 4.9 are OK.")
-endif()
-
-if (NOT CGAL_FOUND)
-  message(ERROR " GudhUI requires CGAL and will not be compiled.")
-endif()
-
-if (NOT Qt5_FOUND)
-  message(ERROR " GudhUI requires Qt5 and will not be compiled.")
-endif()
-
-if (NOT OPENGL_FOUND)
-  message(ERROR " GudhUI requires OpenGL and will not be compiled.")
-endif()
-
-if (NOT QGLVIEWER_FOUND)
-  message(ERROR " GudhUI requires QGLViewer and will not be compiled.")
-endif()
-
-
-
 if ( CGAL_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND AND NOT CGAL_VERSION VERSION_EQUAL 4.8.0)
 
   set(CMAKE_AUTOMOC ON)
@@ -37,8 +15,6 @@ if ( CGAL_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND AND NOT CGAL_
   SET(Boost_USE_MULTITHREAD OFF)
   include_directories (${QGLVIEWER_INCLUDE_DIR})
  
-  #####################################################################
-
   add_executable  ( GudhUI 
     gui/gudhui.cpp
     gui/MainWindow.cpp
@@ -52,14 +28,10 @@ if ( CGAL_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND AND NOT CGAL_
   target_link_libraries( GudhUI Qt5::Widgets Qt5::Xml Qt5::OpenGL )
   target_link_libraries( GudhUI ${QGLVIEWER_LIBRARIES} )
   target_link_libraries( GudhUI ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} )	
-if (TBB_FOUND)
-  target_link_libraries( GudhUI ${TBB_LIBRARIES})
-endif()
+  if (TBB_FOUND)
+    target_link_libraries( GudhUI ${TBB_LIBRARIES})
+  endif()
 
   install(TARGETS GudhUI DESTINATION bin)
 
-###############################################################################
-
-else()
-  message(STATUS "NOTICE: GudhUI requires CGAL, the QGLViewer, OpenGL and Qt5, and will not be compiled.")
 endif()
diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt
index d1761f47..ed0aace1 100644
--- a/src/cython/CMakeLists.txt
+++ b/src/cython/CMakeLists.txt
@@ -300,17 +300,24 @@ if(CYTHON_FOUND)
 
   # Documentation generation is available through sphinx - requires all modules
   if(SPHINX_PATH AND NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
+    set (GUDHI_SPHINX_MESSAGE "Generating API documentation with Sphinx in ${CMAKE_CURRENT_BINARY_DIR}/sphinx/")
+    # User warning - Sphinx is a static pages generator, and configured to work fine with user_version
+    # Images and biblio warnings because not found on developper version
+    if (GUDHI_CYTHON_PATH STREQUAL "src/cython")
+      set (GUDHI_SPHINX_MESSAGE "${GUDHI_SPHINX_MESSAGE} \n WARNING : Sphinx is configured for user version, you run it on developper version. Images and biblio will miss")
+    endif()
     # sphinx target requires gudhi.so, because conf.py reads gudhi version from it
     add_custom_target(sphinx
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc
         COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
-        ${SPHINX_PATH} -b html ${CMAKE_CURRENT_SOURCE_DIR}/doc sphinx
-        DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/gudhi.so")
+        ${SPHINX_PATH} -b html ${CMAKE_CURRENT_SOURCE_DIR}/doc ${CMAKE_CURRENT_BINARY_DIR}/sphinx
+        DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/gudhi.so"
+        COMMENT "${GUDHI_SPHINX_MESSAGE}" VERBATIM)
 
     add_test(NAME sphinx_py_test
              WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
              COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
-             ${SPHINX_PATH} -b doctest ${CMAKE_CURRENT_SOURCE_DIR}/doc doctest)
+             ${SPHINX_PATH} -b doctest ${CMAKE_CURRENT_SOURCE_DIR}/doc ${CMAKE_CURRENT_BINARY_DIR}/doctest)
 
   endif(SPHINX_PATH AND NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
 endif(CYTHON_FOUND)
-- 
cgit v1.2.3