mirror of https://github.com/CGAL/cgal
Fix the handling of Boost
- only search for Boost if extra Boost components are required, - do not test `Boost_FOUND` (because Boost is `REQUIRED` in `find_package`), - use Boost imported targets instead of variable (compatibility with Boost-1.70 CMake config mode)
This commit is contained in:
parent
af16025ce0
commit
70a7fce1fc
|
|
@ -164,36 +164,16 @@ EOF
|
||||||
fi
|
fi
|
||||||
#vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
|
#vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
|
||||||
|
|
||||||
cat << 'EOF'
|
if [ ! -z "$BOOST_COMPONENTS" ]; then
|
||||||
|
cat << 'EOF'
|
||||||
|
|
||||||
# Boost and its components
|
# Boost and its components
|
||||||
EOF
|
EOF
|
||||||
#---------------------------------------------------------------------------
|
|
||||||
|
|
||||||
if [ ! -z "$BOOST_COMPONENTS" ]; then
|
|
||||||
|
|
||||||
echo "find_package( Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS//:/ } )"
|
echo "find_package( Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS//:/ } )"
|
||||||
|
|
||||||
else
|
|
||||||
|
|
||||||
echo "find_package( Boost REQUIRED )"
|
|
||||||
|
|
||||||
fi # additional Boost components
|
fi # additional Boost components
|
||||||
|
|
||||||
#vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
|
|
||||||
cat << 'EOF'
|
|
||||||
|
|
||||||
if ( NOT Boost_FOUND )
|
|
||||||
|
|
||||||
message(STATUS "This project requires the Boost library, and will not be compiled.")
|
|
||||||
|
|
||||||
return()
|
|
||||||
|
|
||||||
endif()
|
|
||||||
EOF
|
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
#vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
|
#vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
|
||||||
cat << 'EOF'
|
cat << 'EOF'
|
||||||
|
|
||||||
|
|
@ -239,7 +219,7 @@ EOF
|
||||||
for boost_component in $BOOST_COMPONENTS; do
|
for boost_component in $BOOST_COMPONENTS; do
|
||||||
BOOST_COMPONENT=`echo $boost_component | tr '[:lower:]' '[:upper:]'`
|
BOOST_COMPONENT=`echo $boost_component | tr '[:lower:]' '[:upper:]'`
|
||||||
echo "add_definitions( \"-DCGAL_USE_BOOST_${BOOST_COMPONENT}\" )"
|
echo "add_definitions( \"-DCGAL_USE_BOOST_${BOOST_COMPONENT}\" )"
|
||||||
echo "list(APPEND CGAL_3RD_PARTY_LIBRARIES \${Boost_${BOOST_COMPONENT}_LIBRARY} )"
|
echo "list(APPEND CGAL_3RD_PARTY_LIBRARIES Boost::${boost_component} )"
|
||||||
done
|
done
|
||||||
IFS=$OLDIFS
|
IFS=$OLDIFS
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue