diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-01-21 14:23:41 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-01-21 14:23:41 +0000 |
| commit | f47e9cba9ce535d1c71a71056858a6ee1503b3ab (patch) | |
| tree | 791e123498c8875215efd262ea995fec0e2c8a8c | |
| parent | a643f762ad100ab0310254e23f0d11d874109a1d (diff) | |
| parent | 41ec4dc1ae5770002ad81a43e5b5bf9b2fca1b98 (diff) | |
Merge of branch TDA_dev_1.1.0 - alpha_persistence and windows fixes
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@419 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: a6ce086bb38baf41a4365751bfc68dd21522a68a
| -rw-r--r-- | src/Persistent_cohomology/example/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Persistent_cohomology/example/CMakeLists.txt b/src/Persistent_cohomology/example/CMakeLists.txt index 742996ca..842f852a 100644 --- a/src/Persistent_cohomology/example/CMakeLists.txt +++ b/src/Persistent_cohomology/example/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6) project(GUDHIExPersCohom) # problem with Visual Studio link on Boost program_options -if (!MSVC) +if (NOT MSVC) add_executable(rips_persistence rips_persistence.cpp) target_link_libraries(rips_persistence ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}) @@ -30,8 +30,8 @@ if (!MSVC) add_definitions(-DDEBUG_TRACES) add_executable(alpha_shapes_persistence alpha_shapes_persistence.cpp) target_link_libraries(alpha_shapes_persistence ${Boost_SYSTEM_LIBRARY} ${GMPXX_LIBRARIES} ${GMP_LIBRARIES} ${CGAL_LIBRARY}) - add_test(alpha_shapes_persistence_2_0_5 ${CMAKE_CURRENT_BINARY_DIR}/persistence_from_file ${CMAKE_SOURCE_DIR}/data/points/bunny_5000 2 0.5) - #add_test(alpha_shapes_persistence_3_3_100 ${CMAKE_CURRENT_BINARY_DIR}/persistence_from_file ${CMAKE_SOURCE_DIR}/data/points/bunny_5000.st -p 3 -m 100) + add_test(alpha_shapes_persistence_2_0_5 ${CMAKE_CURRENT_BINARY_DIR}/alpha_shapes_persistence ${CMAKE_SOURCE_DIR}/data/points/bunny_5000 2 0.5) + #add_test(alpha_shapes_persistence_3_3_100 ${CMAKE_CURRENT_BINARY_DIR}/alpha_shapes_persistence ${CMAKE_SOURCE_DIR}/data/points/bunny_5000.st -p 3 -m 100) endif() endif() |