summaryrefslogtreecommitdiff
path: root/src/CMakeLists.txt
AgeCommit message (Collapse)Author
2016-04-06GUDHIConfig.cmake fixvrouvrea
Modules were missing in src/CMakeLists.txt generate_version.sh must copy GUDHIConfig.cmake and not GUDHIConfig.cmake.in nor CMakeGUDHIVersion.txt git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@1100 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 2b618b7a395017cb1bde8a9a7afd7c9e54c29710
2016-04-04cmake listsfgodi
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneckDistance@1092 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 77b2a427cb3ff80b9a0c5d1c71f9f1de11547530
2016-03-31Unset CGAL_FOUND if CGAL version is less than 4.4 to fix compilation issue ↵vrouvrea
with CGAL 4.2. Documentation says CGAL > 4.4 is recommended. git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/Doxygen_for_GUDHI_1.3.0@1089 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: b20d01d56e080572b067898df94ebe2eebd5893d
2016-03-31Fix TBB issue in CMakevrouvrea
Add TBB in Doxygen git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/Doxygen_for_GUDHI_1.3.0@1086 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: e3d3251431193d21ebf9344c230d12df624cd905
2016-03-20Merge from trunk.glisse
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bitmap@1061 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: a9684c0981a81be9db4362e5bd6c8fb9590661ca
2016-03-18Merge last trunk modificationsvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/witness@1055 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: de98d729fddbaa5c434e1facd8081940198c59f6
2016-03-17Merge from trunk.glisse
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bitmap@1050 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 1a32dd3528c771a78d5749ac2c04503a3d979fe4
2016-02-19Merge last trunk modificationsvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@1032 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 0e5b89e0ea0d69ebfdb74ba3bbf29518f7ce5ce8
2016-02-09Finally, let CGAL set the flags, but before setting CXX_FLAGS with "-std=c++11"vrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/Win64_Boost_Xunit_fix@1011 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: faeca77f4eebf969e608b0c3be67893d646845a9
2016-02-04CMake strategy modificationvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/Win64_Boost_Xunit_fix@1003 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: c917934525e020b54b2f4506b5c9d060a28c9d89
2016-01-21cpplint fixesvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/VR_witness@984 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: c663c383e09719a8c70c1100bb6e21d8fc49e597
2016-01-19Added a concept for Simplicial_complex, also added to doc about knnskachano
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/witness@979 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 7d0a98369571ba5fc40196f41e74dd9d54b094ec
2016-01-14Merged trunk to witness, because CMakeList in test is buggy :-(skachano
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/witness@969 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 84be8354f102538848f16935521fb7a30dc7e3de
2016-01-12Backmerge of last trunk modificationsvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@959 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: a5c6ef0ae2ee1e18fff88b98131ff4d14a252152
2016-01-07Backmerge from trunkvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/tbb@953 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 06624ae4ed4031c7bae56e0b8fa305a318b934bc
2016-01-07TBB find package mechanism with definition for code purpose.vrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/tbb@952 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 9b4dcb962d1af208feccf831171029479d37831e
2015-12-07Merged with trunk and removed unnecessary filesskachano
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/witness@934 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: d0ec52d222d22c102e9fe57590882cd0024c82d5
2015-12-07Changes piled up for monthsskachano
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/witness@932 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 0447901e608890eb607456fd12f3ea53547b8f10
2015-11-27After doc reviewvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@931 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 578da0e6fff453560e666e8f00147f9e10cb6de6
2015-11-27Adding changes to the cubcial complex class according to Marc and Vincent's ↵pdlotko
comments. git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bitmap@930 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: cb9134a5c18fae3e2e63bbaf8329dd168d08d3b3
2015-11-18rev911 rollbackvrouvrea
code review fix fix prune_above_filtration removing every simplices git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@927 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 1660da972bd5198214a0f0384be9be66a5312e74
2015-11-13Utils.h -> Debug_utils.hvrouvrea
More verbose in debug mode (use NDEBUG instead of DEBUG_TRACES) GUDHI_CHECK function to throw in debug or ignore in release mode git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@911 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 250dc0c0f5146f0b9e3fce0e9a8ca0da6af7cf98
2015-11-09Backmerge from trunk.vrouvrea
Alpha complex code review. git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@894 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 702c4d667de4e7191d1050e6d855d2f79117f954
2015-11-06Merge last trunk modificationsvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bitmap@889 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: d90cb012ff7f3a9070ea19e3c6651cc455bebdad
2015-10-23Software page text modificationvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@872 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 43ef4b9ee503de54decee6a25bcd88c9b79be34f
2015-10-13Backmerge from trunkvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@853 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 3f1b56bf4986df7bb2938ea2fff944eb9bf9b653
2015-10-08cpplint fixes on Contraction + warning fixes + Hide Hasse complex for Gudhi ↵vrouvrea
version 1.2.0 git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@841 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: ed7bf90a9ae0b000b995c6ae4bbdaedbb1a65dd5
2015-10-07Let GudhUI in last compilation position as QT is known for modifying ↵vrouvrea
CMAKE_CXX_FLAGS git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@836 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: f3bbe579d98a098b4adc89349e619983ceba225b
2015-10-07Enable test suite for user version.vrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@835 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 87f06171990fe2b5e93515e7c6d3f8553a461f49
2015-10-06Cmake fixesvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@834 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: b11aad4d7984b2f156fac8df298516c7780b0df4
2015-10-06GUDHIConfig.cmake and GUDHIVersion.cmake generationvrouvrea
generate_version.sh modification to take into account these new files git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@830 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 54d3d4f963fb29c9a142be1c28458ce05215ec79
2015-10-05make install fixvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@827 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 7af156ccfdc580bfa52904a6cce77735827d64af
2015-10-05cpplint fixes - simplex_tree_from_file.cpp renamed ↵vrouvrea
simplex_tree_from_cliques_of_graph.cpp - #include "" vs #include <> for skeleton blockers git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@826 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 1bd1ad535e4283bce35eeb31fa8d7896b9de474b
2015-09-25Add bitmap cubical complexvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bitmap@794 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 50d9b8eb80e0fe99f871afa5bdbb853add97e25e
2015-08-24Merge trunk + alpha complex fixesvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@753 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: a0a1f71420736a0a702e6dbc76bc010b36bf5e13
2015-08-12Only one find_package for Boost. Double header inclusion issue.vrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@727 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 83ad3a5a97a3c169f6c25ef1ba8fad07f0730a7a
2015-08-10fix bad merge in src/CMakeLists.txtvrouvrea
Remove commented lines from UT git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@726 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: c0d0c1412205aacbedaa0a562ba5e1e12513020b
2015-08-03backmerge of trunkvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@721 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 1c30d5d84f1f401089f80c08ee1d584f28bf2274
2015-07-07Alpha_shapes removal. Alpha_complex will be added on feature deliveryvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/compil_fix@685 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 5e661587777dc5e07ae6ee42f2f5f207189c6a13
2015-06-18Backmerge of last trunk modificationsvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@625 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 8729c94e37923be0bbf943513025e7362807f041
2015-06-18Moved alphashapedoc.off in data/pointsvrouvrea
Moved Delaunay triangulation OFF files read and write in src/common Delaunay triangulation OFF files read and write documentation, examples and tests git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@623 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: e03902736a79436e97dbf77a88504f3faa8bd9c6
2015-06-16Alpha_complex renamed.vrouvrea
Compilation and tests are OK. bimap is stored in class. bimap is now on CGAL Vertex_iterator - instead of points. is_gabriel not computed when simplex dimension is 1. is_gabriel not computed when filt(Tau) is not NaN. Delaunay_triangulation is a pointer constructed in Delaunay_triangulation_off_io.h git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@617 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 4fa4a26ce47066efe22aed99734ff1dd821ad70b
2015-04-28GudhUI compilation issue and generate version for GudhUI issue fixesvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@583 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: beea454e849615bb9d087ccdcb0110a146a42564
2015-04-24We shouldn't mess with flags in the release version of CMakeLists.txt (the ↵glisse
one at the root if free for any abuse though). git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@570 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 93b1fdf641fa19010f6dbeca755fffd87ee7d12a
2015-04-16CMakeLists.txt fix for version generationvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@569 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 599df696ef30c80a72f0a91528b271ae009163cc
2015-03-25Merged latest trunk to witnessskachano
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/witness@505 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: a90ff18c8991da76cf66daec3dc8f68c049cfe57
2015-03-19Add of bottleneck functionnalityvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneckDistance@492 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 68ecf70a07641fea7106a17bbbf45404747834cc
2015-03-18Add alpha shapes functionnalityvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@488 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: ef821bf7026520540b5869e16c08c290d3ed9477
2015-03-18Added an empty file for wcskachano
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/witness@486 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: fd12027f5ae859c8caaa6a04182c19ff734bdf43
2015-02-23Add of Hasse complex example compilation. Insert_simplex_with_subfaces must ↵vrouvrea
increment number of simplices on each insertion git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@470 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 325d24d0919e216e3b2d816521749e406f0a8f98