diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-24 10:34:57 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-24 10:34:57 +0000 |
commit | 68d786f3b9574c24369fcbeaa36e8280f1d6c447 (patch) | |
tree | a484cc73fabc86ed9add6bf95dea770b6e3b79ed /src/cmake/modules | |
parent | bb30a984430efda39f83ba0284e6430c625e6db6 (diff) | |
parent | 248bbbc14e47b40b491ac30adf47391de32ed0f4 (diff) |
Merge last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneck_misc_fixes@1994 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 9f0adf9d7d1be7f0cb85f1ff2d0e41295d6e9ae0
Diffstat (limited to 'src/cmake/modules')
-rw-r--r-- | src/cmake/modules/FindQGLViewer.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cmake/modules/FindQGLViewer.cmake b/src/cmake/modules/FindQGLViewer.cmake index 1f3dbc1f..56c1b3cf 100644 --- a/src/cmake/modules/FindQGLViewer.cmake +++ b/src/cmake/modules/FindQGLViewer.cmake @@ -15,7 +15,7 @@ find_path(QGLVIEWER_INCLUDE_DIR ) find_library(QGLVIEWER_LIBRARY_RELEASE - NAMES qglviewer-qt4 QGLViewer-qt4 qglviewer QGLViewer QGLViewer2 + NAMES qglviewer-qt5 QGLViewer-qt5 qglviewer QGLViewer QGLViewer2 PATHS /usr/lib /usr/local/lib ENV QGLVIEWERROOT |