Przeglądaj źródła

Use CMAKE_HOST_WIN32 in FindWinSock.cmake.

Chen Yufei 3 lat temu
rodzic
commit
23e92c7813
1 zmienionych plików z 5 dodań i 4 usunięć
  1. 5 4
      cmake/FindWinSock.cmake

+ 5 - 4
cmake/FindWinSock.cmake

@@ -72,14 +72,15 @@ if(MINGW)
   )
   if (NOT RESULT)
     string(REGEX MATCH "libraries: =([^\r\n]*)" OUT "${OUT}")
-    if(UNIX)
-      # On Unix systems, search dirs are separated by ':'.
+    if(CMAKE_HOST_WIN32)
+      message(STATUS "not replacing ${_SEARCH_PATHS}")
+      list(APPEND WINSOCK_LIBRARY_PATHS "${CMAKE_MATCH_1}")
+    else()
+      # On Unix-like host systems, search dirs are separated by ':'.
       # Thus we need to replace ':' with ';' to make a valid cmake list.
       string(REPLACE ":" ";" _SEARCH_PATHS "${CMAKE_MATCH_1}")
       list(APPEND WINSOCK_LIBRARY_PATHS "${_SEARCH_PATHS}")
       unset(_SEARCH_PATHS)
-    else()
-      list(APPEND WINSOCK_LIBRARY_PATHS "${CMAKE_MATCH_1}")
     endif()
   endif()
 endif()