Fix TBB issue in CMake

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

1 files changed, 24 insertions, 2 deletions

diff --git a/src/Persistent_cohomology/example/CMakeLists.txt b/src/Persistent_cohomology/example/CMakeLists.txt
index 95506631..9702a5f9 100644
--- a/src/Persistent_cohomology/example/CMakeLists.txt
+++ b/src/Persistent_cohomology/example/CMakeLists.txt
@@ -7,24 +7,37 @@ add_definitions( -DBOOST_ALL_DYN_LINK )
 
 add_executable(plain_homology plain_homology.cpp)
 target_link_libraries(plain_homology ${Boost_SYSTEM_LIBRARY})
+if (TBB_FOUND)
+  target_link_libraries(plain_homology ${TBB_RELEASE_LIBRARY})
+endif()
 add_test(plain_homology ${CMAKE_CURRENT_BINARY_DIR}/plain_homology)
 
 add_executable(persistence_from_simple_simplex_tree persistence_from_simple_simplex_tree.cpp)
 target_link_libraries(persistence_from_simple_simplex_tree ${Boost_SYSTEM_LIBRARY})
+if (TBB_FOUND)
+  target_link_libraries(persistence_from_simple_simplex_tree ${TBB_RELEASE_LIBRARY})
+endif()
 add_test(persistence_from_simple_simplex_tree ${CMAKE_CURRENT_BINARY_DIR}/persistence_from_simple_simplex_tree 1 0)
 
 add_executable(rips_persistence rips_persistence.cpp)
 target_link_libraries(rips_persistence ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
-   
+if (TBB_FOUND)
+  target_link_libraries(rips_persistence ${TBB_RELEASE_LIBRARY})
+endif()
 add_test(rips_persistence_3 ${CMAKE_CURRENT_BINARY_DIR}/rips_persistence ${CMAKE_SOURCE_DIR}/data/points/Kl.txt -r 0.2 -d 3 -p 3 -m 100)
    
 add_executable(parallel_rips_persistence parallel_rips_persistence.cpp)
 target_link_libraries(parallel_rips_persistence ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
-   
+if (TBB_FOUND)
+  target_link_libraries(parallel_rips_persistence ${TBB_RELEASE_LIBRARY})
+endif()
 add_test(parallel_rips_persistence_3 ${CMAKE_CURRENT_BINARY_DIR}/parallel_rips_persistence ${CMAKE_SOURCE_DIR}/data/points/tore3D_1307.txt -r 0.3 -d 3 -p 3 -m 100)
    
 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(persistence_from_file ${TBB_RELEASE_LIBRARY})
+endif()
 add_test(persistence_from_file_3_2_0 ${CMAKE_CURRENT_BINARY_DIR}/persistence_from_file ${CMAKE_SOURCE_DIR}/data/points/bunny_5000.st -p 2 -m 0)
 add_test(persistence_from_file_3_3_100 ${CMAKE_CURRENT_BINARY_DIR}/persistence_from_file ${CMAKE_SOURCE_DIR}/data/points/bunny_5000.st -p 3 -m 100)
    
@@ -34,10 +47,16 @@ if(GMPXX_FOUND AND GMP_FOUND)
 
    add_executable(rips_multifield_persistence rips_multifield_persistence.cpp )
    target_link_libraries(rips_multifield_persistence ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${GMPXX_LIBRARIES} ${GMP_LIBRARIES})
+   if (TBB_FOUND)
+     target_link_libraries(rips_multifield_persistence ${TBB_RELEASE_LIBRARY})
+   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)
 
    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(performance_rips_persistence ${TBB_RELEASE_LIBRARY})
+   endif()
 
    if(CGAL_FOUND)
      if (CMAKE_BUILD_TYPE MATCHES Debug)
@@ -46,6 +65,9 @@ if(GMPXX_FOUND AND GMP_FOUND)
      endif()
      add_executable(alpha_shapes_persistence alpha_shapes_persistence.cpp)
      target_link_libraries(alpha_shapes_persistence ${Boost_SYSTEM_LIBRARY} ${GMPXX_LIBRARIES} ${GMP_LIBRARIES} ${CGAL_LIBRARY})
+     if (TBB_FOUND)
+       target_link_libraries(alpha_shapes_persistence ${TBB_RELEASE_LIBRARY})
+     endif()
      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()