diff options
| -rw-r--r-- | CMakeLists.txt | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 11a459813..caeb2ab8e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -21,8 +21,6 @@ CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSV | |||
| 21 | 21 | ||
| 22 | option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON) | 22 | option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON) |
| 23 | 23 | ||
| 24 | option(YUZU_USE_BUNDLED_BOOST "Download bundled Boost" OFF) | ||
| 25 | |||
| 26 | option(YUZU_USE_BUNDLED_LIBUSB "Compile bundled libusb" OFF) | 24 | option(YUZU_USE_BUNDLED_LIBUSB "Compile bundled libusb" OFF) |
| 27 | 25 | ||
| 28 | option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" "${WIN32}") | 26 | option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" "${WIN32}") |
| @@ -208,9 +206,7 @@ macro(yuzu_find_packages) | |||
| 208 | unset(FN_FORCE_REQUIRED) | 206 | unset(FN_FORCE_REQUIRED) |
| 209 | endmacro() | 207 | endmacro() |
| 210 | 208 | ||
| 211 | if (NOT YUZU_USE_BUNDLED_BOOST) | 209 | find_package(Boost 1.73.0 COMPONENTS context headers) |
| 212 | find_package(Boost 1.73.0 CONFIG COMPONENTS context headers QUIET) | ||
| 213 | endif() | ||
| 214 | if (Boost_FOUND) | 210 | if (Boost_FOUND) |
| 215 | set(Boost_LIBRARIES Boost::boost) | 211 | set(Boost_LIBRARIES Boost::boost) |
| 216 | # Conditionally add Boost::context only if the active version of the Conan or system Boost package provides it | 212 | # Conditionally add Boost::context only if the active version of the Conan or system Boost package provides it |
| @@ -221,20 +217,6 @@ if (Boost_FOUND) | |||
| 221 | if (TARGET Boost::context) | 217 | if (TARGET Boost::context) |
| 222 | list(APPEND Boost_LIBRARIES Boost::context) | 218 | list(APPEND Boost_LIBRARIES Boost::context) |
| 223 | endif() | 219 | endif() |
| 224 | elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR YUZU_USE_BUNDLED_BOOST) | ||
| 225 | message(STATUS "Boost 1.73.0 or newer not found, falling back to externals") | ||
| 226 | set(YUZU_USE_BUNDLED_BOOST ON CACHE BOOL "Download bundled Boost" FORCE) | ||
| 227 | |||
| 228 | # Use yuzu Boost binaries | ||
| 229 | set(Boost_EXT_NAME "boost_1_75_0") | ||
| 230 | set(Boost_PATH "${CMAKE_BINARY_DIR}/externals/${Boost_EXT_NAME}") | ||
| 231 | download_bundled_external("boost/" ${Boost_EXT_NAME} "") | ||
| 232 | set(Boost_USE_DEBUG_RUNTIME FALSE) | ||
| 233 | set(Boost_USE_STATIC_LIBS ON) | ||
| 234 | find_package(Boost 1.75.0 CONFIG REQUIRED COMPONENTS context headers PATHS ${Boost_PATH} NO_DEFAULT_PATH) | ||
| 235 | # Manually set the include dirs since the find_package sets it incorrectly | ||
| 236 | set(Boost_INCLUDE_DIRS ${Boost_PATH}/include CACHE PATH "Path to Boost headers" FORCE) | ||
| 237 | include_directories(SYSTEM "${Boost_INCLUDE_DIRS}") | ||
| 238 | else() | 220 | else() |
| 239 | message(STATUS "Boost 1.73.0 or newer not found, falling back to Conan") | 221 | message(STATUS "Boost 1.73.0 or newer not found, falling back to Conan") |
| 240 | list(APPEND CONAN_REQUIRED_LIBS "boost/1.78.0") | 222 | list(APPEND CONAN_REQUIRED_LIBS "boost/1.78.0") |