ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7286 from orbea/cubeb 

cmake: Support shared cubeb builds.
This commit is contained in:
Mat M 2018-08-08 13:25:57 -04:00 committed by GitHub
parent 9cd7dfcd8f 227807df36
commit 7be818a354
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMake/FindCubeb.cmake Normal file
View File

@ -0,0 +1,15 @@
find_path(CUBEB_INCLUDE_DIR cubeb.h PATH_SUFFIXES cubeb)
find_library(CUBEB_LIBRARY cubeb)
mark_as_advanced(CUBEB_INCLUDE_DIR CUBEB_LIBRARY)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(CUBEB DEFAULT_MSG
CUBEB_INCLUDE_DIR CUBEB_LIBRARY)
if(CUBEB_FOUND AND NOT TARGET CUBEB)
add_library(cubeb::cubeb UNKNOWN IMPORTED)
set_target_properties(cubeb::cubeb PROPERTIES
IMPORTED_LOCATION "${CUBEB_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${CUBEB_INCLUDE_DIR}"
)
endif()

8
CMakeLists.txt
View File

@ -611,7 +611,13 @@ endif()
add_subdirectory(Externals/soundtouch) add_subdirectory(Externals/soundtouch)
include_directories(Externals) include_directories(Externals)
add_subdirectory(Externals/cubeb EXCLUDE_FROM_ALL) find_package(Cubeb)
if(CUBEB_FOUND)
message(STATUS "Using the system cubeb")
else()
message(STATUS "Using static cubeb from Externals")
add_subdirectory(Externals/cubeb EXCLUDE_FROM_ALL)
endif()
if(NOT ANDROID) if(NOT ANDROID)
add_definitions(-D__LIBUSB__) add_definitions(-D__LIBUSB__)