From 1f7b43d1417601be5bbf42fabd2f0e81418c8b30 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Tue, 2 Feb 2021 09:16:35 +0100 Subject: [PATCH] Don't build the programs if boost_program_options is not found --- .../examples/Jet_fitting_3/CMakeLists.txt | 8 ++++-- .../Jet_fitting_3/Mesh_estimation.cpp | 2 -- Ridges_3/examples/Ridges_3/CMakeLists.txt | 25 +++++++++---------- .../Ridges_3/Compute_Ridges_Umbilics.cpp | 6 +---- .../examples/Ridges_3/Ridges_Umbilics_LCC.cpp | 2 -- .../examples/Ridges_3/Ridges_Umbilics_SM.cpp | 2 -- .../Surface_mesh_shortest_path/CMakeLists.txt | 1 - .../Surface_mesh_shortest_path/TestMesh.cpp | 12 --------- 8 files changed, 19 insertions(+), 39 deletions(-) diff --git a/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt b/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt index afc0c1a9c4d..3e5ffb5b93b 100644 --- a/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt +++ b/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt @@ -14,14 +14,18 @@ if(TARGET CGAL::Eigen3_support) find_package(Boost QUIET COMPONENTS program_options) create_single_source_cgal_program("Mesh_estimation.cpp") - target_link_libraries(Mesh_estimation PUBLIC CGAL::Eigen3_support) if(Boost_PROGRAM_OPTIONS_FOUND) - target_compile_definitions(Mesh_estimation PRIVATE "CGAL_USE_BOOST_PROGRAM_OPTIONS") + target_link_libraries(Mesh_estimation PUBLIC CGAL::Eigen3_support) if(TARGET Boost::filesystem) target_link_libraries(Mesh_estimation PRIVATE Boost::program_options) else() target_link_libraries(Mesh_estimation PRIVATE ${Boost_PROGRAM_OPTIONS_LIBRARY}) endif() + else() + message( + STATUS + "NOTICE: This program requires Boost Program Options and will not be compiled." + ) endif() create_single_source_cgal_program("Single_estimation.cpp") diff --git a/Jet_fitting_3/examples/Jet_fitting_3/Mesh_estimation.cpp b/Jet_fitting_3/examples/Jet_fitting_3/Mesh_estimation.cpp index 207fee3c121..0945986b171 100644 --- a/Jet_fitting_3/examples/Jet_fitting_3/Mesh_estimation.cpp +++ b/Jet_fitting_3/examples/Jet_fitting_3/Mesh_estimation.cpp @@ -6,10 +6,8 @@ #include -#if defined(CGAL_USE_BOOST_PROGRAM_OPTIONS) && ! defined(DONT_USE_BOOST_PROGRAM_OPTIONS) #include namespace po = boost::program_options; -#endif using namespace std; diff --git a/Ridges_3/examples/Ridges_3/CMakeLists.txt b/Ridges_3/examples/Ridges_3/CMakeLists.txt index 914ad661e7f..0ea9b19d09c 100644 --- a/Ridges_3/examples/Ridges_3/CMakeLists.txt +++ b/Ridges_3/examples/Ridges_3/CMakeLists.txt @@ -12,18 +12,14 @@ if(TARGET CGAL::Eigen3_support) # Link with Boost.ProgramOptions (optional) find_package(Boost QUIET COMPONENTS program_options) - create_single_source_cgal_program(Compute_Ridges_Umbilics.cpp) - target_link_libraries(Compute_Ridges_Umbilics PUBLIC CGAL::Eigen3_support) - create_single_source_cgal_program(Ridges_Umbilics_SM.cpp) - target_link_libraries(Ridges_Umbilics_SM PUBLIC CGAL::Eigen3_support) - create_single_source_cgal_program(Ridges_Umbilics_LCC.cpp) - target_link_libraries(Ridges_Umbilics_LCC PUBLIC CGAL::Eigen3_support) - if(Boost_PROGRAM_OPTIONS_FOUND) - target_compile_definitions(Compute_Ridges_Umbilics PRIVATE "CGAL_USE_BOOST_PROGRAM_OPTIONS") - target_compile_definitions(Ridges_Umbilics_SM PRIVATE "CGAL_USE_BOOST_PROGRAM_OPTIONS") - target_compile_definitions(Ridges_Umbilics_LCC PRIVATE "CGAL_USE_BOOST_PROGRAM_OPTIONS") - if(TARGET Boost::filesystem) + create_single_source_cgal_program(Compute_Ridges_Umbilics.cpp) + target_link_libraries(Compute_Ridges_Umbilics PUBLIC CGAL::Eigen3_support) + create_single_source_cgal_program(Ridges_Umbilics_SM.cpp) + target_link_libraries(Ridges_Umbilics_SM PUBLIC CGAL::Eigen3_support) + create_single_source_cgal_program(Ridges_Umbilics_LCC.cpp) + target_link_libraries(Ridges_Umbilics_LCC PUBLIC CGAL::Eigen3_support) + if(TARGET Boost::program_options) target_link_libraries(Compute_Ridges_Umbilics PRIVATE Boost::program_options) target_link_libraries(Ridges_Umbilics_SM PRIVATE Boost::program_options) target_link_libraries(Ridges_Umbilics_LCC PRIVATE Boost::program_options) @@ -32,12 +28,15 @@ if(TARGET CGAL::Eigen3_support) target_link_libraries(Ridges_Umbilics_SM PRIVATE ${Boost_PROGRAM_OPTIONS_LIBRARY}) target_link_libraries(Ridges_Umbilics_LCC PRIVATE ${Boost_PROGRAM_OPTIONS_LIBRARY}) endif() + else() + message( + STATUS + "NOTICE: This programs require Boost Program Options and will not be compiled." + ) endif() else() - message( STATUS "NOTICE: This program requires Eigen 3.1 (or greater) and will not be compiled." ) - endif() diff --git a/Ridges_3/examples/Ridges_3/Compute_Ridges_Umbilics.cpp b/Ridges_3/examples/Ridges_3/Compute_Ridges_Umbilics.cpp index 47e014a1102..66516d5e092 100644 --- a/Ridges_3/examples/Ridges_3/Compute_Ridges_Umbilics.cpp +++ b/Ridges_3/examples/Ridges_3/Compute_Ridges_Umbilics.cpp @@ -9,13 +9,9 @@ #include #include #include - - - -#if defined(CGAL_USE_BOOST_PROGRAM_OPTIONS) && ! defined(DONT_USE_BOOST_PROGRAM_OPTIONS) #include + namespace po = boost::program_options; -#endif typedef PolyhedralSurf::Traits Kernel; diff --git a/Ridges_3/examples/Ridges_3/Ridges_Umbilics_LCC.cpp b/Ridges_3/examples/Ridges_3/Ridges_Umbilics_LCC.cpp index 247a6badd3d..5ce258d2909 100644 --- a/Ridges_3/examples/Ridges_3/Ridges_Umbilics_LCC.cpp +++ b/Ridges_3/examples/Ridges_3/Ridges_Umbilics_LCC.cpp @@ -11,10 +11,8 @@ #include #include -#if defined(CGAL_USE_BOOST_PROGRAM_OPTIONS) && ! defined(DONT_USE_BOOST_PROGRAM_OPTIONS) #include namespace po = boost::program_options; -#endif typedef CGAL::Simple_cartesian Kernel; diff --git a/Ridges_3/examples/Ridges_3/Ridges_Umbilics_SM.cpp b/Ridges_3/examples/Ridges_3/Ridges_Umbilics_SM.cpp index 458d1e8ff5a..b73f19cb409 100644 --- a/Ridges_3/examples/Ridges_3/Ridges_Umbilics_SM.cpp +++ b/Ridges_3/examples/Ridges_3/Ridges_Umbilics_SM.cpp @@ -8,10 +8,8 @@ #include #include -#if defined(CGAL_USE_BOOST_PROGRAM_OPTIONS) && ! defined(DONT_USE_BOOST_PROGRAM_OPTIONS) #include namespace po = boost::program_options; -#endif typedef CGAL::Simple_cartesian Kernel; diff --git a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/CMakeLists.txt b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/CMakeLists.txt index 05cfb06b98c..235ec1b7ef9 100644 --- a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/CMakeLists.txt +++ b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/CMakeLists.txt @@ -22,7 +22,6 @@ find_package(Boost QUIET COMPONENTS program_options) if(Boost_PROGRAM_OPTIONS_FOUND) if(CGAL_Core_FOUND OR LEDA_FOUND) create_single_source_cgal_program("TestMesh.cpp") - target_compile_definitions(TestMesh PRIVATE "CGAL_USE_BOOST_PROGRAM_OPTIONS") if(TARGET Boost::filesystem) target_link_libraries(TestMesh PRIVATE Boost::program_options) else() diff --git a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/TestMesh.cpp b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/TestMesh.cpp index 95613fdbb30..389cc215f11 100644 --- a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/TestMesh.cpp +++ b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/TestMesh.cpp @@ -1,8 +1,5 @@ #include #include - -#if defined(CGAL_USE_BOOST_PROGRAM_OPTIONS) && ! defined(DONT_USE_BOOST_PROGRAM_OPTIONS) - #include #include #include @@ -350,12 +347,3 @@ int main(int argc, char** argv) return 0; } - - -#else - int main() - { - std::cout << "TestMesh.cpp needs Boost Program Options" << std::endl; - return 0; - } -#endif