@ -194,13 +194,18 @@ macro(yuzu_find_packages)
unset ( FN_FORCE_REQUIRED )
endmacro ( )
if ( NOT Boost_FOUND )
find_package ( Boost 1.73.0 COMPONENTS context headers QUIET )
if ( Boost_FOUND )
set ( Boost_LIBRARIES Boost::boost Boost::context )
find_package ( Boost 1.73.0 COMPONENTS context headers QUIET )
if ( Boost_FOUND )
set ( Boost_LIBRARIES Boost::boost )
# C o n d i t i o n a l l y a d d B o o s t : : c o n t e x t o n l y i f t h e a c t i v e v e r s i o n o f t h e C o n a n o r s y s t e m B o o s t p a c k a g e p r o v i d e s i t
# T h e o l d v e r s i o n i s m i s s i n g B o o s t : : c o n t e x t , s o w e w a n t t o a v o i d a d d i n g i n t h a t c a s e
# T h e n e w v e r s i o n r e q u i r e s a d d i n g B o o s t : : c o n t e x t t o p r e v e n t l i n k i n g i s s u e s
#
# T h i s o n e i s u s e d b y C o n a n o n s u b s e q u e n t C M a k e c o n f i g u r e s , n o t t h e f i r s t c o n f i g u r e .
if ( TARGET Boost::context )
list ( APPEND Boost_LIBRARIES Boost::context )
endif ( )
endif ( )
if ( NOT Boost_FOUND )
else ( )
message ( STATUS "Boost 1.73.0 or newer not found, falling back to Conan" )
list ( APPEND CONAN_REQUIRED_LIBS "boost/1.73.0" )
endif ( )
@ -312,6 +317,12 @@ if (CONAN_REQUIRED_LIBS)
if ( NOT Boost_FOUND )
find_package ( Boost 1.73.0 REQUIRED COMPONENTS context headers )
set ( Boost_LIBRARIES Boost::boost )
# C o n d i t i o n a l l y a d d B o o s t : : c o n t e x t o n l y i f t h e a c t i v e v e r s i o n o f t h e C o n a n B o o s t p a c k a g e p r o v i d e s i t
# T h e o l d v e r s i o n i s m i s s i n g B o o s t : : c o n t e x t , s o w e w a n t t o a v o i d a d d i n g i n t h a t c a s e
# T h e n e w v e r s i o n r e q u i r e s a d d i n g B o o s t : : c o n t e x t t o p r e v e n t l i n k i n g i s s u e s
if ( TARGET Boost::context )
list ( APPEND Boost_LIBRARIES Boost::context )
endif ( )
endif ( )
# D u e t o i s s u e s w i t h v a r i a b l e s c o p e s i n f u n c t i o n s , w e n e e d t o a l s o find_package ( qt5 ) o u t s i d e o f t h e f u n c t i o n