From 9d4e6f28ceeb362c9d751cbac730a13d1b5d61c7 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Wed, 19 Jun 2019 08:56:56 +0200 Subject: CGAL 4.11 as minimal version --- src/common/example/CMakeLists.txt | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'src/common') diff --git a/src/common/example/CMakeLists.txt b/src/common/example/CMakeLists.txt index b9263cc9..583a0027 100644 --- a/src/common/example/CMakeLists.txt +++ b/src/common/example/CMakeLists.txt @@ -6,8 +6,6 @@ file(COPY "${CMAKE_SOURCE_DIR}/data/points/alphacomplexdoc.off" DESTINATION ${CM add_test(NAME Common_example_vector_double_off_reader COMMAND $ "alphacomplexdoc.off") -install(TARGETS vector_double_off_reader DESTINATION bin) - if (DIFF_PATH) # Do not forget to copy test results files in current binary dir file(COPY "vectordoubleoffreader_result.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/) @@ -16,21 +14,17 @@ if (DIFF_PATH) ${CMAKE_CURRENT_BINARY_DIR}/vectordoubleoffreader_result.txt ${CMAKE_CURRENT_BINARY_DIR}/alphacomplexdoc.off.txt) endif() -if(CGAL_FOUND) +if(NOT CGAL_VERSION VERSION_LESS 4.11.0) add_executable ( cgal_3D_off_reader example_CGAL_3D_points_off_reader.cpp ) target_link_libraries(cgal_3D_off_reader ${CGAL_LIBRARY}) add_test(NAME Common_example_vector_cgal_3D_off_reader COMMAND $ "${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off") - - install(TARGETS cgal_3D_off_reader DESTINATION bin) - - # need CGAL 4.7 and Eigen3 - if(NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0) - add_executable ( cgal_off_reader example_CGAL_points_off_reader.cpp ) - target_link_libraries(cgal_off_reader ${CGAL_LIBRARY}) - add_test(NAME Common_example_vector_cgal_off_reader COMMAND $ - "${CMAKE_SOURCE_DIR}/data/points/alphacomplexdoc.off") - install(TARGETS cgal_off_reader DESTINATION bin) - endif(NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0) - endif() + +# requires CGAL and Eigen3 +if(NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0) + add_executable ( cgal_off_reader example_CGAL_points_off_reader.cpp ) + target_link_libraries(cgal_off_reader ${CGAL_LIBRARY}) + add_test(NAME Common_example_vector_cgal_off_reader COMMAND $ + "${CMAKE_SOURCE_DIR}/data/points/alphacomplexdoc.off") +endif(NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0) -- cgit v1.2.3