|
@@ -202,7 +202,7 @@ macro(yuzu_find_packages)
|
|
|
endmacro()
|
|
endmacro()
|
|
|
|
|
|
|
|
if (NOT YUZU_USE_BUNDLED_BOOST)
|
|
if (NOT YUZU_USE_BUNDLED_BOOST)
|
|
|
- find_package(Boost 1.73.0 COMPONENTS context headers QUIET)
|
|
|
|
|
|
|
+ find_package(Boost 1.73.0 CONFIG COMPONENTS context headers QUIET)
|
|
|
endif()
|
|
endif()
|
|
|
if (Boost_FOUND)
|
|
if (Boost_FOUND)
|
|
|
set(Boost_LIBRARIES Boost::boost)
|
|
set(Boost_LIBRARIES Boost::boost)
|
|
@@ -224,7 +224,7 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR YUZU_USE_BUNDLED_BOOST)
|
|
|
download_bundled_external("boost/" ${Boost_EXT_NAME} "")
|
|
download_bundled_external("boost/" ${Boost_EXT_NAME} "")
|
|
|
set(Boost_USE_DEBUG_RUNTIME FALSE)
|
|
set(Boost_USE_DEBUG_RUNTIME FALSE)
|
|
|
set(Boost_USE_STATIC_LIBS ON)
|
|
set(Boost_USE_STATIC_LIBS ON)
|
|
|
- find_package(Boost 1.75.0 REQUIRED COMPONENTS context headers PATHS ${Boost_PATH} NO_DEFAULT_PATH)
|
|
|
|
|
|
|
+ find_package(Boost 1.75.0 CONFIG REQUIRED COMPONENTS context headers PATHS ${Boost_PATH} NO_DEFAULT_PATH)
|
|
|
# Manually set the include dirs since the find_package sets it incorrectly
|
|
# Manually set the include dirs since the find_package sets it incorrectly
|
|
|
set(Boost_INCLUDE_DIRS ${Boost_PATH}/include CACHE PATH "Path to Boost headers" FORCE)
|
|
set(Boost_INCLUDE_DIRS ${Boost_PATH}/include CACHE PATH "Path to Boost headers" FORCE)
|
|
|
include_directories(SYSTEM "${Boost_INCLUDE_DIRS}")
|
|
include_directories(SYSTEM "${Boost_INCLUDE_DIRS}")
|
bunnei