diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2014-12-11 10:31:28 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2014-12-11 10:31:28 +0000 |
commit | bc09913a3a69da8cc3cbeb3eb796f166ef1025e2 (patch) | |
tree | 8952e397d7989f16472cc65826017a9e5fcbaba7 /src/Simplex_tree | |
parent | c97ef32a8f8959c3ad67543a5e22fb6e1a82cda5 (diff) |
CMakeLists uniformization
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/cpplint_test@348 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: b680aa0555385fb96c4e6217a15283daec0c4c50
Diffstat (limited to 'src/Simplex_tree')
-rw-r--r-- | src/Simplex_tree/example/CMakeLists.txt | 10 | ||||
-rw-r--r-- | src/Simplex_tree/test/CMakeLists.txt | 7 |
2 files changed, 4 insertions, 13 deletions
diff --git a/src/Simplex_tree/example/CMakeLists.txt b/src/Simplex_tree/example/CMakeLists.txt index 956d1fa9..cf7585b9 100644 --- a/src/Simplex_tree/example/CMakeLists.txt +++ b/src/Simplex_tree/example/CMakeLists.txt @@ -1,17 +1,13 @@ cmake_minimum_required(VERSION 2.6) project(GUDHISimplexTreeFromFile) -# NEED TO FIND BOOST NEEDED COMPONENTS TO LINK WITH -find_package(Boost 1.45.0 COMPONENTS system thread) -message("Boost_lib = ${Boost_LIBRARIES}") - add_executable ( simplex_tree_from_file simplex_tree_from_file.cpp ) -target_link_libraries(simplex_tree_from_file ${Boost_LIBRARIES}) +target_link_libraries(simplex_tree_from_file ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY}) add_test(simplex_tree_from_file_2 ${CMAKE_CURRENT_BINARY_DIR}/simplex_tree_from_file ${CMAKE_SOURCE_DIR}/data/points/Klein_bottle_complex.txt 2) add_test(simplex_tree_from_file_3 ${CMAKE_CURRENT_BINARY_DIR}/simplex_tree_from_file ${CMAKE_SOURCE_DIR}/data/points/Klein_bottle_complex.txt 3) add_executable ( simple_simplex_tree simple_simplex_tree.cpp ) -target_link_libraries(simple_simplex_tree ${Boost_LIBRARIES}) +target_link_libraries(simple_simplex_tree ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY}) add_test(simple_simplex_tree ${CMAKE_CURRENT_BINARY_DIR}/simple_simplex_tree) # An example with Simplex-tree using CGAL alpha_shapes_3 @@ -21,6 +17,6 @@ if(GMPXX_FOUND AND GMP_FOUND AND CGAL_FOUND) message("GMP_LIBRARIES = ${GMP_LIBRARIES}") add_executable ( simplex_tree_from_alpha_shapes_3 simplex_tree_from_alpha_shapes_3.cpp ) - target_link_libraries(simplex_tree_from_alpha_shapes_3 ${Boost_LIBRARIES} ${GMPXX_LIBRARIES} ${GMP_LIBRARIES} ${CGAL_LIBRARY}) + target_link_libraries(simplex_tree_from_alpha_shapes_3 ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY} ${GMPXX_LIBRARIES} ${GMP_LIBRARIES} ${CGAL_LIBRARY}) add_test(simplex_tree_from_alpha_shapes_3 ${CMAKE_CURRENT_BINARY_DIR}/simplex_tree_from_alpha_shapes_3 ${CMAKE_SOURCE_DIR}/data/points/bunny_5000) endif() diff --git a/src/Simplex_tree/test/CMakeLists.txt b/src/Simplex_tree/test/CMakeLists.txt index e3fcc557..80594870 100644 --- a/src/Simplex_tree/test/CMakeLists.txt +++ b/src/Simplex_tree/test/CMakeLists.txt @@ -1,19 +1,14 @@ cmake_minimum_required(VERSION 2.6) project(GUDHITestSimplexTree) -# NEED TO FIND BOOST NEEDED COMPONENTS TO LINK WITH -find_package(Boost 1.45.0 COMPONENTS system unit_test_framework) -message("Boost_lib = ${Boost_LIBRARIES}") - if(NOT MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} --coverage") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} --coverage") endif() -include_directories(${Boost_INCLUDE_DIRS}) add_executable ( simplex_tree_unit_test simplex_tree_unit_test.cpp ) -target_link_libraries(simplex_tree_unit_test ${Boost_LIBRARIES}) +target_link_libraries(simplex_tree_unit_test ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) # Unitary tests add_test(simplex_tree_unit_test ${CMAKE_CURRENT_BINARY_DIR}/simplex_tree_unit_test) |