Compare commits

...

2 Commits

Author SHA1 Message Date
voidanix
fac4b7783c cmake: remove headers requirement from boost
While the boost headers are obviously still necessary, this avoids the following warning that made it fall back to the external
boost:

CMake Warning at /usr/share/cmake/Modules/FindBoost.cmake:2216 (message):
  No header defined for headers; skipping header check (note: header-only
  libraries have no designated component)
Call Stack (most recent call first):
  CMakeLists.txt:212 (find_package)
2022-02-16 12:52:43 +01:00
voidanix
0e9d5b9b5c cmake: remove QUIET from ffmpeg/boost detection
This allows for specific error messages from cmake itself about version requirements or
missing components/headers.

Update the boost detection message as well and turn it into a warning.
2022-02-16 12:48:06 +01:00

View File

@@ -209,7 +209,7 @@ macro(yuzu_find_packages)
endmacro()
if (NOT YUZU_USE_BUNDLED_BOOST)
find_package(Boost 1.73.0 CONFIG COMPONENTS context headers QUIET)
find_package(Boost 1.73.0 COMPONENTS context)
endif()
if (Boost_FOUND)
set(Boost_LIBRARIES Boost::boost)
@@ -222,7 +222,7 @@ if (Boost_FOUND)
list(APPEND Boost_LIBRARIES Boost::context)
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")
message(WARNING "Boost not found or too old, falling back to externals")
set(YUZU_USE_BUNDLED_BOOST ON CACHE BOOL "Download bundled Boost" FORCE)
# Use yuzu Boost binaries
@@ -522,7 +522,7 @@ if (UNIX AND NOT APPLE)
endif()
if (NOT YUZU_USE_BUNDLED_FFMPEG)
# Use system installed FFmpeg
find_package(FFmpeg 4.3 QUIET COMPONENTS ${FFmpeg_COMPONENTS})
find_package(FFmpeg 4.3 COMPONENTS ${FFmpeg_COMPONENTS})
if (FFmpeg_FOUND)
# Overwrite aggregate defines from FFmpeg module to avoid over-linking libraries.