diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-24 09:34:04 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-24 09:34:04 +0000 |
| commit | be37aaeadc31ed10ede53393237d939d4aa47c82 (patch) | |
| tree | 6b990088ce68cc19b3db1b8789eab831e62dc747 /src/cmake | |
| parent | 30a66f9431d059eed620e0535583e914fa5a3c74 (diff) | |
| parent | cd9d7681e06f29a25cf5775a384ac2e07e34abe9 (diff) | |
Merge last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@1989 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 0743b9beb802b839357ecce17e11af5d4ef2a163
Diffstat (limited to 'src/cmake')
| -rw-r--r-- | src/cmake/modules/FindQGLViewer.cmake | 2 | ||||
| -rw-r--r-- | src/cmake/modules/GUDHI_user_version_target.txt | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/src/cmake/modules/GUDHI_user_version_target.txt b/src/cmake/modules/GUDHI_user_version_target.txt index a48f0ee3..742cbe8c 100644 --- a/src/cmake/modules/GUDHI_user_version_target.txt +++ b/src/cmake/modules/GUDHI_user_version_target.txt @@ -50,7 +50,7 @@ if (NOT CMAKE_VERSION VERSION_LESS 2.8.11) add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/src/GudhUI ${GUDHI_USER_VERSION_DIR}/GudhUI) - set(GUDHI_MODULES "common;Alpha_complex;Bitmap_cubical_complex;Contraction;Hasse_complex;Persistent_cohomology;Simplex_tree;Skeleton_blocker;Spatial_searching;Subsampling;Tangential_complex;Witness_complex") + set(GUDHI_MODULES "common;Alpha_complex;Bitmap_cubical_complex;Bottleneck_distance;Contraction;Hasse_complex;Persistent_cohomology;Rips_complex;Simplex_tree;Skeleton_blocker;Spatial_searching;Subsampling;Tangential_complex;Witness_complex") foreach(GUDHI_MODULE ${GUDHI_MODULES}) # doc files |