diff options
| author | Rechi <Rechi@users.noreply.github.com> | 2018-07-16 13:00:00 +0200 |
|---|---|---|
| committer | Rechi <Rechi@users.noreply.github.com> | 2018-07-16 13:00:00 +0200 |
| commit | 740e800c2b3fe2b785450815f9d5bee84eeabf11 (patch) | |
| tree | c8b1a7684e8ec1c8217130d698ed5d0103770562 /cmake | |
| parent | c1e760e1ee60cc1c6bd27c141a9c2072402e5d59 (diff) | |
link with libbluray instead of loading it dynamic
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindBluray.cmake | 19 | ||||
| -rw-r--r-- | cmake/scripts/android/Install.cmake | 1 |
2 files changed, 7 insertions, 13 deletions
diff --git a/cmake/modules/FindBluray.cmake b/cmake/modules/FindBluray.cmake index 8e524fc756..58a9a912cb 100644 --- a/cmake/modules/FindBluray.cmake +++ b/cmake/modules/FindBluray.cmake @@ -30,20 +30,13 @@ if(NOT BLURAY_VERSION AND EXISTS ${BLURAY_INCLUDE_DIR}/libbluray/bluray-version. unset(_bluray_version_str) endif() -include(FindPackageHandleStandardArgs) -if(NOT WIN32) - find_library(BLURAY_LIBRARY NAMES bluray - PATHS ${PC_BLURAY_LIBDIR}) +find_library(BLURAY_LIBRARY NAMES bluray libbluray + PATHS ${PC_BLURAY_LIBDIR}) - find_package_handle_standard_args(Bluray - REQUIRED_VARS BLURAY_LIBRARY BLURAY_INCLUDE_DIR BLURAY_VERSION - VERSION_VAR BLURAY_VERSION) -else() - # Dynamically loaded DLL - find_package_handle_standard_args(Bluray - REQUIRED_VARS BLURAY_INCLUDE_DIR - VERSION_VAR BLURAY_VERSION) -endif() +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Bluray + REQUIRED_VARS BLURAY_LIBRARY BLURAY_INCLUDE_DIR BLURAY_VERSION + VERSION_VAR BLURAY_VERSION) if(BLURAY_FOUND) set(BLURAY_LIBRARIES ${BLURAY_LIBRARY}) diff --git a/cmake/scripts/android/Install.cmake b/cmake/scripts/android/Install.cmake index 0218f2533b..a0fa155a61 100644 --- a/cmake/scripts/android/Install.cmake +++ b/cmake/scripts/android/Install.cmake @@ -152,6 +152,7 @@ foreach(lib IN LISTS required_dyload dyload_optional ITEMS Shairplay) endif() endforeach() add_bundle_file(${ASS_LIBRARY} ${libdir} "") +add_bundle_file(${BLURAY_LIBRARY} ${libdir} "") add_bundle_file(${SMBCLIENT_LIBRARY} ${libdir} "") # Main targets from Makefile.in |