summaryrefslogtreecommitdiff
path: root/src/CMakeLists.txt
AgeCommit message (Collapse)Author
2017-05-19Move src/common/utilities/hypergenerator.cpp in src/common/utilitiesvrouvrea
Management of Python distribution packages make install is now installing utilities and GUDHI python module git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/cmake_modules_for_gudhi@2453 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: a85576c7ae062718900f0db2bfb0dd3f26e87177
2017-05-18Modify the way cmake handles utilities, examples, test and benchmarks with ↵vrouvrea
new options to activate/desactivate them. Move hypergenerator as a common utility. Move random point generation from hypergenerator in src/common/include/gudhi/random_point_generators.h git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/cmake_modules_for_gudhi@2442 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: e2d13e4b0c09455fb604b684f6d71530352271eb
2017-04-18Rename CMake testsvrouvrea
Add specific GUDHI test coverage function Rename cmake/modules/GUDHI_*.txt git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/add_test_windows@2362 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 071b1eda7d11b1781a9601a013b88a0b2a9b7bf7
2017-04-14Remove scripts/generate_version.sh, use make user_versionvrouvrea
Remove GUDHIVersion.cmake.in (was for scripts/generate_version.sh) and CMakeLists.txt mechanism Modify src/Bitmap_cubical_complex/example/CMakeLists.txt to generate files in build directory git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@2358 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 32c73be6aa9a0a6fcfde09ebf21ff38d48abf5e0
2017-03-31Fix examples testsvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@2289 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 9d386b82c89601da233f7c61254a023ddffc9abc
2017-03-30Move example tests in a new CMakeLists.txtvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@2288 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 8b2bce4c8be8a34b8fba9c664d2f0b3b60a50c20
2017-03-24Factorize third party management and extract them from CMakeLists.txtvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/cgal_4.8_issue@2239 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 6ed246b649418a623919b8b337ce366f5cc1d27f
2017-03-03Merge last trunk modificatinosvrouvrea
make sphinx depends on cython target git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@2155 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: ebb1709872963ffd30a6d31ab596f2715ca14436
2017-02-28Move -DBOOST_ALL_DYN_LINK from persistence to global CMakeLists.txt (also ↵vrouvrea
required by witness) Add CGAL and Eigen3 required by Witness in main page Add examples to be tested for Witness git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/relaxed-witness@2115 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 33fbdf3e970c35635ae2738c1ace801f077ec750
2017-01-24Merge last trunk modificationsvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@1989 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 0743b9beb802b839357ecce17e11af5d4ef2a163
2017-01-16Merge last trunk modificationsvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/distance_matrix_in_rips_module@1938 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 8af39a00b9134dbcc77883412c29d7184479979b
2016-12-15Merge last trunk modificationsvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneck_integration@1888 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 951a081ac634f829fa49265005ea1e620f2c08ca
2016-11-16Merged last trunk modificationsvrouvrea
Make Witness compile and test git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/rips_complex_module@1755 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: e6eec55ac0a4cc66da3bb081a222cae5b998c1cf
2016-10-20Merge last trunk modificationvrouvrea
Fix doc issue Still doc issue git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@1739 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 0a99345f06e93a3525691699a6fe1505979e8e8e
2016-10-11Problem of merge with tangentialcomplex branch.vrouvrea
Redo in an integration branch git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/tangential_integration@1701 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: fa029e8e90b3e203ea675f02098ec6fe95596f9f
2016-09-29Fix doxygenvrouvrea
Add tests git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/rips_complex_module@1589 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 3b03e969f43f4f41c7bca1b2de96a71688475742
2016-09-27Merge last trunk modificationsvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneck_integration@1568 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 14c192615a0b9b79121a8395e721978b72272536
2016-09-21Merge from trunkcjamin
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/subsampling_and_spatialsearching@1520 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 477d84d9b29057de29afbb77d830d9d46a8f54be
2016-09-14-Wsign-compare is included into -Wallvrouvrea
-pedantic is recognized by icpc (and also gcc and clang) unlike -Wpedantic git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@1494 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 6ad63e46a4e077bc4e16852eb0cb443db7c5197d
2016-09-13Merge branch bottleneckDistance on a up-to-date branchvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneck_integration@1492 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: bccdeaf8456b7b88ad2da71205dbb4c5d08a53ee
2016-09-08Add doxygen target for user and developper version.vrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/make_user_version@1481 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: b76661a6d3e91508ffa21f1e183a5e822f6a92bf
2016-08-24Merge from trunkcjamin
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/subsampling_and_spatialsearching@1451 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: fd62937e290abdaf84b406897855e15267b9ebd4
2016-08-04Make GUDHI Cmake less verbose on CGAL package findingvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@1415 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 2eebce43b0f75ab1cef3a2fe6f2c1bd0b38672a9
2016-08-04Merge from trunkcjamin
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/subsampling_and_spatialsearching@1413 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: bb7801bb78feccf12ff73c6e82511806753db8dd
2016-07-01Eigen3 find_package factorizationvrouvrea
CGAL find package in root CMakeLists.txt for Witness complex git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/eigen3_cmake_factorization@1377 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 32137f7687837c63ecfab3a2d11114b27873a1f2
2016-06-28Modify FindGMPXX.cmake to set directoryvrouvrea
Cython CmakeLists.txt for compilation and tests (still export PYTHONPATH to be solved) git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@1349 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: cc46d7ef7c34ce2bc0408eb612e5ab9241b4c9c0
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-08GUDHIConfig.cmake fixvrouvrea
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@1106 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 79bac32f28985e759f0e3c04a470e29325ecd64f
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