From 2577b55681a97f3eec3fb0e3b5a4fb7f2cb18b8a Mon Sep 17 00:00:00 2001
From: manuel <manuel@mausz.at>
Date: Thu, 30 Aug 2018 00:42:04 +0200
Subject: sync with upstream

---
 cmake/modules/FindBluray.cmake | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

(limited to 'cmake/modules/FindBluray.cmake')

diff --git a/cmake/modules/FindBluray.cmake b/cmake/modules/FindBluray.cmake
index 3c29f54..58a9a91 100644
--- a/cmake/modules/FindBluray.cmake
+++ b/cmake/modules/FindBluray.cmake
@@ -3,7 +3,7 @@
 # ----------
 # Finds the libbluray library
 #
-# This will will define the following variables::
+# This will define the following variables::
 #
 # BLURAY_FOUND - system has libbluray
 # BLURAY_INCLUDE_DIRS - the libbluray include directory
@@ -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})
-- 
cgit v1.2.3