From a255b6f2af1c24d7b84ef2c71cd85799415b1ac8 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Thu, 18 Dec 2014 14:50:18 +0000 Subject: GMP 4.2 min git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@386 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 89d337fd218b4515a6e1edb1cf374e4c2d95c1fa --- CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- src/Simplex_tree/example/CMakeLists.txt | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 78867423..d0264491 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,7 @@ endif() # BOOST ISSUE result_of vs C++11 add_definitions(-DBOOST_RESULT_OF_USE_DECLTYPE) find_package(Boost) -find_package(GMP) +find_package(GMP 4.2) if(GMP_FOUND) find_package(GMPXX) endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b15cfe98..4c0e7507 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -18,7 +18,7 @@ endif() add_definitions(-DBOOST_RESULT_OF_USE_DECLTYPE) find_package(Boost) -find_package(GMP) +find_package(GMP 4.2) if(GMP_FOUND) find_package(GMPXX) endif() diff --git a/src/Simplex_tree/example/CMakeLists.txt b/src/Simplex_tree/example/CMakeLists.txt index 14f51bfe..1a3cdfbf 100644 --- a/src/Simplex_tree/example/CMakeLists.txt +++ b/src/Simplex_tree/example/CMakeLists.txt @@ -2,12 +2,10 @@ cmake_minimum_required(VERSION 2.6) project(GUDHISimplexTreeFromFile) add_executable ( simplex_tree_from_file simplex_tree_from_file.cpp ) -target_link_libraries(simplex_tree_from_file ${Boost_SYSTEM_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_SYSTEM_LIBRARY}) add_test(simple_simplex_tree ${CMAKE_CURRENT_BINARY_DIR}/simple_simplex_tree) @@ -18,6 +16,6 @@ if(GMP_FOUND AND CGAL_FOUND) INCLUDE_DIRECTORIES(${GMP_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${CGAL_INCLUDE_DIRS}) 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_SYSTEM_LIBRARY} ${GMP_LIBRARIES} ${CGAL_LIBRARY}) + target_link_libraries(simplex_tree_from_alpha_shapes_3 ${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() -- cgit v1.2.3