Rename namespaces according to convention

+ Missing Boost_THREAD_LIBRARY
+ Useless typename
+ Use TBB_LIBRARIES

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/fix_naming@1274 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 5c02ec481b62ef52b40d849e76e3d333e2ca4e7c

1 files changed, 12 insertions, 12 deletions

diff --git a/src/Persistent_cohomology/example/CMakeLists.txt b/src/Persistent_cohomology/example/CMakeLists.txt
index f85c50f9..a0af11c1 100644
--- a/src/Persistent_cohomology/example/CMakeLists.txt
+++ b/src/Persistent_cohomology/example/CMakeLists.txt
@@ -21,11 +21,11 @@ add_executable(persistence_from_file persistence_from_file.cpp)
 target_link_libraries(persistence_from_file ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
 
 if (TBB_FOUND)
-  target_link_libraries(plain_homology ${TBB_RELEASE_LIBRARY})
-  target_link_libraries(persistence_from_simple_simplex_tree ${TBB_RELEASE_LIBRARY})
-  target_link_libraries(rips_persistence ${TBB_RELEASE_LIBRARY})
-  target_link_libraries(rips_persistence_via_boundary_matrix ${TBB_RELEASE_LIBRARY})
-  target_link_libraries(persistence_from_file ${TBB_RELEASE_LIBRARY})
+  target_link_libraries(plain_homology ${TBB_LIBRARIES})
+  target_link_libraries(persistence_from_simple_simplex_tree ${TBB_LIBRARIES})
+  target_link_libraries(rips_persistence ${TBB_LIBRARIES})
+  target_link_libraries(rips_persistence_via_boundary_matrix ${TBB_LIBRARIES})
+  target_link_libraries(persistence_from_file ${TBB_LIBRARIES})
 endif()
 
 add_test(plain_homology ${CMAKE_CURRENT_BINARY_DIR}/plain_homology)
@@ -44,8 +44,8 @@ if(GMPXX_FOUND AND GMP_FOUND)
    add_executable ( performance_rips_persistence performance_rips_persistence.cpp )
    target_link_libraries(performance_rips_persistence ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${GMPXX_LIBRARIES} ${GMP_LIBRARIES})
    if (TBB_FOUND)
-     target_link_libraries(rips_multifield_persistence ${TBB_RELEASE_LIBRARY})
-     target_link_libraries(performance_rips_persistence ${TBB_RELEASE_LIBRARY})
+     target_link_libraries(rips_multifield_persistence ${TBB_LIBRARIES})
+     target_link_libraries(performance_rips_persistence ${TBB_LIBRARIES})
    endif()
 
    add_test(rips_multifield_persistence_2_71 ${CMAKE_CURRENT_BINARY_DIR}/rips_multifield_persistence ${CMAKE_SOURCE_DIR}/data/points/Kl.txt -r 0.2 -d 3 -p 2 -q 71 -m 100)
@@ -55,7 +55,7 @@ if(GMPXX_FOUND AND GMP_FOUND)
     target_link_libraries(alpha_complex_3d_persistence ${Boost_SYSTEM_LIBRARY} ${GMPXX_LIBRARIES} ${GMP_LIBRARIES} ${CGAL_LIBRARY})
 
     if (TBB_FOUND)
-      target_link_libraries(alpha_complex_3d_persistence ${TBB_RELEASE_LIBRARY})
+      target_link_libraries(alpha_complex_3d_persistence ${TBB_LIBRARIES})
     endif()
     add_test(alpha_complex_3d_persistence_2_0_5 ${CMAKE_CURRENT_BINARY_DIR}/alpha_complex_3d_persistence ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off 2 0.45)
 
@@ -78,12 +78,12 @@ if(GMPXX_FOUND AND GMP_FOUND)
         target_link_libraries(custom_persistence_sort ${Boost_SYSTEM_LIBRARY} ${GMPXX_LIBRARIES} ${GMP_LIBRARIES} ${CGAL_LIBRARY})
 
         if (TBB_FOUND)
-          target_link_libraries(alpha_complex_persistence ${TBB_RELEASE_LIBRARY})
-          target_link_libraries(periodic_alpha_complex_3d_persistence ${TBB_RELEASE_LIBRARY})
-          target_link_libraries(custom_persistence_sort ${TBB_RELEASE_LIBRARY})
+          target_link_libraries(alpha_complex_persistence ${TBB_LIBRARIES})
+          target_link_libraries(periodic_alpha_complex_3d_persistence ${TBB_LIBRARIES})
+          target_link_libraries(custom_persistence_sort ${TBB_LIBRARIES})
         endif()
         add_test(alpha_complex_persistence_2_0_45 ${CMAKE_CURRENT_BINARY_DIR}/alpha_complex_persistence ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -m 0.45 -p 2)
-        add_test(periodic_alpha_complex_3d_persistence_2_0 ${CMAKE_CURRENT_BINARY_DIR}/periodic_alpha_complex_3d_persistence ${CMAKE_SOURCE_DIR}/data/points/grid_10_10_10_in_0_1.off 2 0)
+        add_test(periodic_alpha_complex_3d_persistence_2_0 ${CMAKE_CURRENT_BINARY_DIR}/periodic_alpha_complex_3d_persistence ${CMAKE_SOURCE_DIR}/data/points/grid_10_10_10_in_0_1.off ${CMAKE_SOURCE_DIR}/data/points/iso_cuboid_3_in_0_1.txt 2 0)
         add_test(custom_persistence_sort ${CMAKE_CURRENT_BINARY_DIR}/custom_persistence_sort)
 
       else()