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

Fix the use of Boost program options.

This commit is contained in:
Laurent Rineau 2008-11-10 10:23:40 +00:00
parent 90a4d915b1
commit 38e5a4ebf5
5 changed files with 15 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -1748,7 +1748,6 @@ Installation/lib/CGAL-3.4/CGAL_SetupGMPXX.cmake -text
Installation/lib/CGAL-3.4/CGAL_SetupLEDA.cmake -text
Installation/lib/CGAL-3.4/CGAL_SetupMPFR.cmake -text
Installation/lib/CGAL-3.4/CGAL_UseBLAS.cmake -text
Installation/lib/CGAL-3.4/CGAL_UseBoostProgramOptions.cmake -text
Installation/lib/CGAL-3.4/CGAL_UseLAPACK.cmake -text
Installation/lib/CGAL-3.4/CGAL_UseTAUCS.cmake -text
Installation/lib/CGAL-3.4/FindBLAS.cmake -text

35
Installation/lib/CGAL-3.4/CGAL_UseBoostProgramOptions.cmake
View File

@ -1,35 +0,0 @@
if ( NOT Boost_PROGRAM_OPTIONS_FOUND )
if ( NOT BUILD_SHARED_LIBS )
set(Boost_USE_STATIC_LIBS ON)
endif()
set(Boost_FIND_VERSION 1.33.1 )
set(Boost_FIND_VERSION_MAJOR 1 )
set(Boost_FIND_VERSION_MINOR 33 )
set(Boost_FIND_VERSION_PATCH 1 )
find_package( Boost QUIET COMPONENTS program_options )
if ( Boost_PROGRAM_OPTIONS_FOUND )
if( CGAL_AUTO_LINK_ENABLED )
message( STATUS "Boost.ProgramOptions library: found" )
else()
message( STATUS "Boost.ProgramOptions library: ${Boost_PROGRAM_OPTIONS_LIBRARY}" )
endif()
add_definitions( "-DCGAL_USE_BOOST_PROGRAM_OPTIONS" )
if ( NOT CGAL_AUTO_LINK_ENABLED )
link_libraries( ${Boost_PROGRAM_OPTIONS_LIBRARY} )
endif()
else()
message( STATUS "Could not find Boost.ProgramOptions library" )
endif()
endif()

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

@ -24,7 +24,11 @@ if ( CGAL_FOUND )
include( ${LAPACK_USE_FILE} )
# Link with Boost.ProgramOptions (optional)
include( CGAL_UseBoostProgramOptions )
find_package(Boost QUIET COMPONENTS program_options)
if(Boost_PROGRAM_OPTIONS_FOUND)
add_definitions( "-DCGAL_USE_BOOST_PROGRAM_OPTIONS" )
link_libraries( ${Boost_PROGRAM_OPTIONS_LIBRARY} )
endif()
create_single_source_cgal_program( "Mesh_estimation.cpp" )
create_single_source_cgal_program( "Single_estimation.cpp" )

7
Kinetic_data_structures/demo/Kinetic_data_structures/CMakeLists.txt
View File

@ -33,9 +33,12 @@ if ( CGAL_FOUND )
include_directories (BEFORE include)
include( CGAL_UseBoostProgramOptions )
# Link with Boost.ProgramOptions (optional)
find_package(Boost QUIET COMPONENTS program_options)
if(Boost_PROGRAM_OPTIONS_FOUND)
add_definitions( "-DCGAL_USE_BOOST_PROGRAM_OPTIONS" )
link_libraries( ${Boost_PROGRAM_OPTIONS_LIBRARY} )
endif()
# Demo KDS_Delaunay_triangulation_2
add_executable (KDS_Delaunay_triangulation_2 KDS_Delaunay_triangulation_2.cpp)

6
Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt
View File

@ -37,7 +37,11 @@ if ( CGAL_FOUND )
include( CGAL_CreateSingleSourceCGALProgram )
# Link with Boost.ProgramOptions (optional)
include( CGAL_UseBoostProgramOptions )
find_package(Boost QUIET COMPONENTS program_options)
if(Boost_PROGRAM_OPTIONS_FOUND)
add_definitions( "-DCGAL_USE_BOOST_PROGRAM_OPTIONS" )
link_libraries( ${Boost_PROGRAM_OPTIONS_LIBRARY} )
endif()
include_directories (BEFORE include)