Fix QGLViewer library names for Ubuntu wily and xenial, make QGLViewer linking more robust using full paths

Author: ahornung

octovis/CMakeModules/FindQGLViewer.cmake

@@ -23,7 +23,7 @@ FIND_PATH( QGLViewer_INCLUDE_DIR qglviewer.h
     ${QGLVIEWER_BASE_DIR}
 )
 
-FIND_LIBRARY( QGLViewer_LIBRARY_DIR_UBUNTU qglviewer-qt4 )
+FIND_LIBRARY( QGLViewer_LIBRARY_DIR_UBUNTU NAMES qglviewer-qt4 QGLViewer-qt4)
 FIND_LIBRARY( QGLViewer_LIBRARY_DIR_WINDOWS QGLViewer2 ${QGLVIEWER_BASE_DIR})
 FIND_LIBRARY( QGLViewer_LIBRARY_DIR_OTHER QGLViewer ${QGLVIEWER_BASE_DIR})
 
@@ -33,22 +33,16 @@ IF( QGLViewer_INCLUDE_DIR )
 
   MESSAGE(STATUS "QGLViewer includes found in ${QGLViewer_INCLUDE_DIR}")
   IF (QGLViewer_LIBRARY_DIR_UBUNTU)
-    MESSAGE(STATUS "qglviewer-qt4 found in ${QGLViewer_LIBRARY_DIR_UBUNTU}")
-    # strip filename from path
-    GET_FILENAME_COMPONENT( QGLViewer_LIBRARY_DIR ${QGLViewer_LIBRARY_DIR_UBUNTU} PATH CACHE )
-    SET( QGLViewer_LIBRARIES qglviewer-qt4)
+    MESSAGE(STATUS "QGLViewer library found in ${QGLViewer_LIBRARY_DIR_UBUNTU}")
+    SET( QGLViewer_LIBRARIES ${QGLViewer_LIBRARY_DIR_UBUNTU})
     SET( QGLViewer_FOUND 1 CACHE BOOL "Do we have QGLViewer?" FORCE )
   ELSEIF(QGLViewer_LIBRARY_DIR_WINDOWS)
-    # strip filename from path
-    GET_FILENAME_COMPONENT( QGLViewer_LIBRARY_DIR ${QGLViewer_LIBRARY_DIR_WINDOWS} PATH CACHE )
-    SET( QGLViewer_LIBRARIES QGLViewer2)
+    MESSAGE(STATUS "QGLViewer2 found in ${QGLViewer_LIBRARY_DIR_WINDOWS}")
+    SET( QGLViewer_LIBRARIES ${QGLViewer_LIBRARY_DIR_WINDOWS})
     SET( QGLViewer_FOUND 1 CACHE BOOL "Do we have QGLViewer?" FORCE )
-    MESSAGE(STATUS "QGLViewer2.lib found in ${QGLViewer_LIBRARY_DIR}")
   ELSEIF(QGLViewer_LIBRARY_DIR_OTHER)
-    MESSAGE(STATUS "QGLViewer found: ${QGLViewer_LIBRARY_DIR_OTHER}")
-    # strip filename from path
-    GET_FILENAME_COMPONENT( QGLViewer_LIBRARY_DIR ${QGLViewer_LIBRARY_DIR_OTHER} PATH CACHE )
-    SET( QGLViewer_LIBRARIES QGLViewer)
+    MESSAGE(STATUS "QGLViewer found in ${QGLViewer_LIBRARY_DIR_OTHER}")
+    SET( QGLViewer_LIBRARIES ${QGLViewer_LIBRARY_DIR_OTHER})
     SET( QGLViewer_FOUND 1 CACHE BOOL "Do we have QGLViewer?" FORCE )
   ELSE()
     MESSAGE(STATUS "QGLViewer library not found.")