sync with upstreamHEADmaster

1 files changed, 18 insertions, 24 deletions

diff --git a/cmake/modules/FindShairplay.cmake b/cmake/modules/FindShairplay.cmake
index bbb3372..506cffd 100644
--- a/cmake/modules/FindShairplay.cmake
+++ b/cmake/modules/FindShairplay.cmake
@@ -17,32 +17,26 @@
 find_path(SHAIRPLAY_INCLUDE_DIR shairplay/raop.h)
 
 include(FindPackageHandleStandardArgs)
-if(NOT WIN32)
-  find_library(SHAIRPLAY_LIBRARY NAMES shairplay)
-
-  if(SHAIRPLAY_INCLUDE_DIR AND SHAIRPLAY_LIBRARY)
-    include(CheckCSourceCompiles)
-    set(CMAKE_REQUIRED_INCLUDES ${SHAIRPLAY_INCLUDE_DIRS})
-    set(CMAKE_REQUIRED_LIBRARIES ${SHAIRPLAY_LIBRARIES})
-    check_c_source_compiles("#include <shairplay/raop.h>
-
-                             int main()
-                             {
-                               struct raop_callbacks_s foo;
-                               foo.cls;
-                               return 0;
-                             }
-                            " HAVE_SHAIRPLAY_CALLBACK_CLS)
-  endif()
-
-  find_package_handle_standard_args(Shairplay
-                                    REQUIRED_VARS SHAIRPLAY_LIBRARY SHAIRPLAY_INCLUDE_DIR HAVE_SHAIRPLAY_CALLBACK_CLS)
-else()
-  # Dynamically loaded DLL
-  find_package_handle_standard_args(Shairplay
-                                    REQUIRED_VARS SHAIRPLAY_INCLUDE_DIR)
+find_library(SHAIRPLAY_LIBRARY NAMES shairplay libshairplay)
+
+if(SHAIRPLAY_INCLUDE_DIR AND SHAIRPLAY_LIBRARY)
+  include(CheckCSourceCompiles)
+  set(CMAKE_REQUIRED_INCLUDES ${SHAIRPLAY_INCLUDE_DIR})
+  set(CMAKE_REQUIRED_LIBRARIES ${SHAIRPLAY_LIBRARIES})
+  check_c_source_compiles("#include <shairplay/raop.h>
+
+                           int main()
+                           {
+                             struct raop_callbacks_s foo;
+                             foo.cls;
+                             return 0;
+                           }
+                          " HAVE_SHAIRPLAY_CALLBACK_CLS)
 endif()
 
+find_package_handle_standard_args(Shairplay
+                                  REQUIRED_VARS SHAIRPLAY_LIBRARY SHAIRPLAY_INCLUDE_DIR HAVE_SHAIRPLAY_CALLBACK_CLS)
+
 if(SHAIRPLAY_FOUND)
   set(SHAIRPLAY_LIBRARIES ${SHAIRPLAY_LIBRARY})
   set(SHAIRPLAY_INCLUDE_DIRS ${SHAIRPLAY_INCLUDE_DIR})