@ -21,8 +21,6 @@ CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSV
option ( ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON )
option ( ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON )
option ( YUZU_USE_BUNDLED_BOOST "Download bundled Boost" OFF )
option ( YUZU_USE_BUNDLED_LIBUSB "Compile bundled libusb" OFF )
option ( YUZU_USE_BUNDLED_LIBUSB "Compile bundled libusb" OFF )
option ( YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" "${WIN32}" )
option ( YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" "${WIN32}" )
@ -208,9 +206,7 @@ macro(yuzu_find_packages)
unset ( FN_FORCE_REQUIRED )
unset ( FN_FORCE_REQUIRED )
endmacro ( )
endmacro ( )
if ( NOT YUZU_USE_BUNDLED_BOOST )
find_package ( Boost 1.73.0 COMPONENTS context headers )
find_package ( Boost 1.73.0 CONFIG COMPONENTS context headers QUIET )
endif ( )
if ( Boost_FOUND )
if ( Boost_FOUND )
set ( Boost_LIBRARIES Boost::boost )
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
# 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
@ -221,20 +217,6 @@ if (Boost_FOUND)
if ( TARGET Boost::context )
if ( TARGET Boost::context )
list ( APPEND Boost_LIBRARIES Boost::context )
list ( APPEND Boost_LIBRARIES Boost::context )
endif ( )
endif ( )
elseif ( ${ CMAKE_SYSTEM_NAME } STREQUAL "Linux" OR YUZU_USE_BUNDLED_BOOST )
message ( STATUS "Boost 1.73.0 or newer not found, falling back to externals" )
set ( YUZU_USE_BUNDLED_BOOST ON CACHE BOOL "Download bundled Boost" FORCE )
# U s e y u z u B o o s t b i n a r i e s
set ( Boost_EXT_NAME "boost_1_75_0" )
set ( Boost_PATH "${CMAKE_BINARY_DIR}/externals/${Boost_EXT_NAME}" )
download_bundled_external ( "boost/" ${ Boost_EXT_NAME } "" )
set ( Boost_USE_DEBUG_RUNTIME FALSE )
set ( Boost_USE_STATIC_LIBS ON )
find_package ( Boost 1.75.0 CONFIG REQUIRED COMPONENTS context headers PATHS ${ Boost_PATH } NO_DEFAULT_PATH )
# M a n u a l l y s e t t h e i n c l u d e d i r s s i n c e t h e f i n d _ p a c k a g e s e t s i t i n c o r r e c t l y
set ( Boost_INCLUDE_DIRS ${ Boost_PATH } /include CACHE PATH "Path to Boost headers" FORCE )
include_directories ( SYSTEM "${Boost_INCLUDE_DIRS}" )
else ( )
else ( )
message ( STATUS "Boost 1.73.0 or newer not found, falling back to Conan" )
message ( STATUS "Boost 1.73.0 or newer not found, falling back to Conan" )
list ( APPEND CONAN_REQUIRED_LIBS "boost/1.78.0" )
list ( APPEND CONAN_REQUIRED_LIBS "boost/1.78.0" )