songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't build the programs if boost_program_options is not found

This commit is contained in:
Maxime Gimeno 2021-02-02 09:16:35 +01:00
parent 1a693828e1
commit 1f7b43d141
8 changed files with 19 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt
View File

@ -14,14 +14,18 @@ if(TARGET CGAL::Eigen3_support)
find_package(Boost QUIET COMPONENTS program_options) find_package(Boost QUIET COMPONENTS program_options)
create_single_source_cgal_program("Mesh_estimation.cpp") create_single_source_cgal_program("Mesh_estimation.cpp")
target_link_libraries(Mesh_estimation PUBLIC CGAL::Eigen3_support)
if(Boost_PROGRAM_OPTIONS_FOUND) 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) if(TARGET Boost::filesystem)
target_link_libraries(Mesh_estimation PRIVATE Boost::program_options) target_link_libraries(Mesh_estimation PRIVATE Boost::program_options)
else() else()
target_link_libraries(Mesh_estimation PRIVATE ${Boost_PROGRAM_OPTIONS_LIBRARY}) target_link_libraries(Mesh_estimation PRIVATE ${Boost_PROGRAM_OPTIONS_LIBRARY})
endif() endif()
else()
message(
STATUS
"NOTICE: This program requires Boost Program Options and will not be compiled."
)
endif() endif()
create_single_source_cgal_program("Single_estimation.cpp") create_single_source_cgal_program("Single_estimation.cpp")

2
Jet_fitting_3/examples/Jet_fitting_3/Mesh_estimation.cpp
View File

@ -6,10 +6,8 @@
#include <CGAL/property_map.h> #include <CGAL/property_map.h>
#if defined(CGAL_USE_BOOST_PROGRAM_OPTIONS) && ! defined(DONT_USE_BOOST_PROGRAM_OPTIONS)
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
namespace po = boost::program_options; namespace po = boost::program_options;
#endif
using namespace std; using namespace std;

15
Ridges_3/examples/Ridges_3/CMakeLists.txt
View File

@ -12,18 +12,14 @@ if(TARGET CGAL::Eigen3_support)
# Link with Boost.ProgramOptions (optional) # Link with Boost.ProgramOptions (optional)
find_package(Boost QUIET COMPONENTS program_options) find_package(Boost QUIET COMPONENTS program_options)
if(Boost_PROGRAM_OPTIONS_FOUND)
create_single_source_cgal_program(Compute_Ridges_Umbilics.cpp) create_single_source_cgal_program(Compute_Ridges_Umbilics.cpp)
target_link_libraries(Compute_Ridges_Umbilics PUBLIC CGAL::Eigen3_support) target_link_libraries(Compute_Ridges_Umbilics PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program(Ridges_Umbilics_SM.cpp) create_single_source_cgal_program(Ridges_Umbilics_SM.cpp)
target_link_libraries(Ridges_Umbilics_SM PUBLIC CGAL::Eigen3_support) target_link_libraries(Ridges_Umbilics_SM PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program(Ridges_Umbilics_LCC.cpp) create_single_source_cgal_program(Ridges_Umbilics_LCC.cpp)
target_link_libraries(Ridges_Umbilics_LCC PUBLIC CGAL::Eigen3_support) target_link_libraries(Ridges_Umbilics_LCC PUBLIC CGAL::Eigen3_support)
if(TARGET Boost::program_options)
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)
target_link_libraries(Compute_Ridges_Umbilics PRIVATE 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_SM PRIVATE Boost::program_options)
target_link_libraries(Ridges_Umbilics_LCC 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_SM PRIVATE ${Boost_PROGRAM_OPTIONS_LIBRARY})
target_link_libraries(Ridges_Umbilics_LCC PRIVATE ${Boost_PROGRAM_OPTIONS_LIBRARY}) target_link_libraries(Ridges_Umbilics_LCC PRIVATE ${Boost_PROGRAM_OPTIONS_LIBRARY})
endif() endif()
else()
message(
STATUS
"NOTICE: This programs require Boost Program Options and will not be compiled."
)
endif() endif()
else() else()
message( message(
STATUS STATUS
"NOTICE: This program requires Eigen 3.1 (or greater) and will not be compiled." "NOTICE: This program requires Eigen 3.1 (or greater) and will not be compiled."
) )
endif() endif()

6
Ridges_3/examples/Ridges_3/Compute_Ridges_Umbilics.cpp
View File

@ -9,13 +9,9 @@
#include <CGAL/Monge_via_jet_fitting.h> #include <CGAL/Monge_via_jet_fitting.h>
#include <fstream> #include <fstream>
#include <cassert> #include <cassert>
#if defined(CGAL_USE_BOOST_PROGRAM_OPTIONS) && ! defined(DONT_USE_BOOST_PROGRAM_OPTIONS)
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
namespace po = boost::program_options; namespace po = boost::program_options;
#endif
typedef PolyhedralSurf::Traits Kernel; typedef PolyhedralSurf::Traits Kernel;

2
Ridges_3/examples/Ridges_3/Ridges_Umbilics_LCC.cpp
View File

@ -11,10 +11,8 @@
#include <cassert> #include <cassert>
#include <CGAL/boost/graph/IO/polygon_mesh_io.h> #include <CGAL/boost/graph/IO/polygon_mesh_io.h>
#if defined(CGAL_USE_BOOST_PROGRAM_OPTIONS) && ! defined(DONT_USE_BOOST_PROGRAM_OPTIONS)
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
namespace po = boost::program_options; namespace po = boost::program_options;
#endif
typedef CGAL::Simple_cartesian<double> Kernel; typedef CGAL::Simple_cartesian<double> Kernel;

2
Ridges_3/examples/Ridges_3/Ridges_Umbilics_SM.cpp
View File

@ -8,10 +8,8 @@
#include <fstream> #include <fstream>
#include <cassert> #include <cassert>
#if defined(CGAL_USE_BOOST_PROGRAM_OPTIONS) && ! defined(DONT_USE_BOOST_PROGRAM_OPTIONS)
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
namespace po = boost::program_options; namespace po = boost::program_options;
#endif
typedef CGAL::Simple_cartesian<double> Kernel; typedef CGAL::Simple_cartesian<double> Kernel;

1
Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/CMakeLists.txt
View File

@ -22,7 +22,6 @@ find_package(Boost QUIET COMPONENTS program_options)
if(Boost_PROGRAM_OPTIONS_FOUND) if(Boost_PROGRAM_OPTIONS_FOUND)
if(CGAL_Core_FOUND OR LEDA_FOUND) if(CGAL_Core_FOUND OR LEDA_FOUND)
create_single_source_cgal_program("TestMesh.cpp") create_single_source_cgal_program("TestMesh.cpp")
target_compile_definitions(TestMesh PRIVATE "CGAL_USE_BOOST_PROGRAM_OPTIONS")
if(TARGET Boost::filesystem) if(TARGET Boost::filesystem)
target_link_libraries(TestMesh PRIVATE Boost::program_options) target_link_libraries(TestMesh PRIVATE Boost::program_options)
else() else()

12
Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/TestMesh.cpp
View File

@ -1,8 +1,5 @@
#include <CGAL/config.h> #include <CGAL/config.h>
#include <iostream> #include <iostream>
#if defined(CGAL_USE_BOOST_PROGRAM_OPTIONS) && ! defined(DONT_USE_BOOST_PROGRAM_OPTIONS)
#include <iomanip> #include <iomanip>
#include <fstream> #include <fstream>
#include <utility> #include <utility>
@ -350,12 +347,3 @@ int main(int argc, char** argv)
return 0; return 0;
} }
#else
int main()
{
std::cout << "TestMesh.cpp needs Boost Program Options" << std::endl;
return 0;
}
#endif