summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
AgeCommit message (Collapse)Author
2016-05-11Create 2 new packages: Subsampling & Spatial_searchingcjamin
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/subsampling_and_spatialsearching@1167 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: e7053d379e936bb6c3f82bd323837285decba5d2
2016-05-10Clock.h requires Boost.Date_timecjamin
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@1159 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 536869c84e7ced010376bc7c8a7d9608764e7247
2016-05-10Missing "include(${TBB_USE_FILE})"cjamin
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@1158 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 61e131f64d4abcf238c24da563fe58703e450346
2016-04-08Merge of alpha complex feature from trunkvrouvrea
Add Eigen3 in installation Add alpha complex in introduction All examples directory moved to example (was example/common, example/Alpha_complex) git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/Doxygen_for_GUDHI_1.3.0@1110 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 0b88a4f2b102e2189f4b916b8358ffb2458a72f0
2016-04-08Merge last trunk developmentvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@1107 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: a8fcecf0beb0517a1da01c57d2e1c2e32a2aba89
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-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-02-04roll back of main CMakeLists.txtvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/Win64_Boost_Xunit_fix@1002 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 6d35cce4cabe0afdb9bcabb23d8bbe6d63b6480e
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-19Remove all but Simplex tree test and example for tests suite to be fatservrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/Win64_Boost_Xunit_fix@976 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 97de76828552676ecf33cc8d47bc3a85a5e66253
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-12Fix alpha complex remarks and bugsvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@957 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: fa837fd1a4373c2322db16353d98767907f34c79
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-11Commit code and doc reviewvrouvrea
Still issue and lot of logs in simplex_tree::prune_above_filtration git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@945 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: cd4f60ddcacb0444e0eb3b9323d8042eb49b132e
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-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-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-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-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-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-09-28Revert CMakeLists.txt changes that were not meant to be committed.glisse
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@801 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 7d2fd6075973bea9816fb140cc4636ce80eb8b8b
2015-09-28Release CAM cells.glisse
There are a lot of intrusive containers in there, and I believe that most could be replaced with regular containers. git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@800 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 7246d7db0511ac6bffee2f645c006416a986629d
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-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-07Add traces for cmake issue on Macvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/compil_fix@686 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 1557839d804203d796986aa6b61385b336963b13
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-18Ignore this commented linevrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@624 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 0c8ce17217e7b110df0276f51295fd02af4b54e3
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-27Struggled with CMake...skachano
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/witness@579 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 38b558196806b226cba5e1ef30abb927619bbe33
2015-04-08Added rock-age style off readerskachano
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/witness@553 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 74462161c45893cfbfcc1875569b93b365445e35
2015-04-02Merge xunit branch back into trunkvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@537 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 1d7c35db28bfead8c5f93dde47c5c695e5ec5c68
2015-04-02add gprof tags - cpplint_to_cppcheckxml.py fixesvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/xunit@533 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: fd6945efd5d63d78fd1f5120bf708a3aebdb90f5
2015-04-01GCovr replaces lcov - cpplint_to_cppcheckxml to be conform with xml version 2 vrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/xunit@529 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: e042eea0b285159f071afb0d07729e6c381f036d
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