From 9899ae167f281d10b1684dfcd02c6838c5bf28df Mon Sep 17 00:00:00 2001
From: Gard Spreemann <gspreemann@gmail.com>
Date: Fri, 2 Feb 2018 13:51:45 +0100
Subject: GUDHI 2.1.0 as released by upstream in a tarball.

---
 GudhUI/CMakeLists.txt | 66 +++++++++++++++++++++++++++------------------------
 1 file changed, 35 insertions(+), 31 deletions(-)

(limited to 'GudhUI')

diff --git a/GudhUI/CMakeLists.txt b/GudhUI/CMakeLists.txt
index 374195d0..2503a03e 100644
--- a/GudhUI/CMakeLists.txt
+++ b/GudhUI/CMakeLists.txt
@@ -1,37 +1,41 @@
 cmake_minimum_required(VERSION 2.8)
 project(GudhUI)
 
-find_package(Qt5 COMPONENTS Widgets Xml OpenGL)
-find_package(QGLViewer)
+# Need to find OpenGL first as find_package(Qt5) tries to #include"GL/gl.h" on some platforms
 find_package(OpenGL)
 
-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)
-  set(CMAKE_AUTOUIC ON)
-  set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-  SET(Boost_USE_STATIC_LIBS ON)
-  SET(Boost_USE_MULTITHREAD OFF)
-  include_directories (${QGLVIEWER_INCLUDE_DIR})
- 
-  add_executable  ( GudhUI 
-    gui/gudhui.cpp
-    gui/MainWindow.cpp
-    gui/Menu_k_nearest_neighbors.cpp	
-    gui/Menu_uniform_neighbors.cpp
-    gui/Menu_edge_contraction.cpp  
-    gui/Menu_persistence.cpp
-    view/Viewer_instructor.cpp				
-    view/Viewer.cpp
-  )	
-  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})
+if (OPENGL_FOUND)
+  find_package(Qt5 COMPONENTS Widgets Xml OpenGL)
+  find_package(QGLViewer)
+  
+  if ( CGAL_FOUND AND Qt5_FOUND AND QGLVIEWER_FOUND AND NOT CGAL_VERSION VERSION_EQUAL 4.8.0)
+  
+    set(CMAKE_AUTOMOC ON)
+    set(CMAKE_AUTOUIC ON)
+    set(CMAKE_INCLUDE_CURRENT_DIR ON)
+  
+    SET(Boost_USE_STATIC_LIBS ON)
+    SET(Boost_USE_MULTITHREAD OFF)
+    include_directories (${QGLVIEWER_INCLUDE_DIR})
+   
+    add_executable  ( GudhUI 
+      gui/gudhui.cpp
+      gui/MainWindow.cpp
+      gui/Menu_k_nearest_neighbors.cpp	
+      gui/Menu_uniform_neighbors.cpp
+      gui/Menu_edge_contraction.cpp  
+      gui/Menu_persistence.cpp
+      view/Viewer_instructor.cpp				
+      view/Viewer.cpp
+    )	
+    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()
+  
+    install(TARGETS GudhUI DESTINATION bin)
+  
   endif()
-
-  install(TARGETS GudhUI DESTINATION bin)
-
-endif()
+endif(OPENGL_FOUND)
\ No newline at end of file
-- 
cgit v1.2.3