[Groonga-commit] groonga/groonga [master] cmake windows: check ws2_32 after winsock2.h

Back to archive index

Kouhei Sutou null+****@clear*****
Fri Mar 29 11:42:33 JST 2013


Kouhei Sutou	2013-03-29 11:42:33 +0900 (Fri, 29 Mar 2013)

  New Revision: 3b28f7288b3c4357a87a44bb46716a766ff984d5
  https://github.com/groonga/groonga/commit/3b28f7288b3c4357a87a44bb46716a766ff984d5

  Message:
    cmake windows: check ws2_32 after winsock2.h
    
    refs #1691

  Modified files:
    CMakeLists.txt

  Modified: CMakeLists.txt (+4 -4)
===================================================================
--- CMakeLists.txt    2013-03-28 18:08:04 +0900 (7b3054d)
+++ CMakeLists.txt    2013-03-29 11:42:33 +0900 (c83f0fb)
@@ -129,10 +129,6 @@ if(UNIX)
   endif()
 endif()
 
-if(WIN32)
-  ac_check_lib(ws2_32 select)
-endif()
-
 option(WITH_NFKC "use NFKC based UTF8 normalization." ON)
 option(WITH_STATIC "build static library." OFF)
 
@@ -141,6 +137,10 @@ if(WIN32)
   if(NOT ${HAVE_WINSOCK2_H} EQUAL 1)
     message(FATAL_ERROR "No winsock2.h found")
   endif()
+  ac_check_lib(ws2_32 select)
+  if(NOT ${HAVE_WS2_32_LIB} EQUAL 1)
+    message(FATAL_ERROR "select() isn't found in ws2_32.lib")
+  endif()
   set(USE_SELECT TRUE)
 else()
   ac_check_headers(sys/epoll.h)
-------------- next part --------------
HTML����������������������������...
다운로드 



More information about the Groonga-commit mailing list
Back to archive index