CDRIVER-959 cmake config for MinGW-W64

Author: ajdavis

CMakeLists.txt

@@ -160,14 +160,20 @@ endif ()
 include(CheckIncludeFiles)
 CHECK_INCLUDE_FILES(strings.h HAVE_STRINGS_H)
 
+if (MINGW)
+   # Define _CRT_RAND_S, so that MinGW's stdlib.h declares Microsoft's rand_s().
+   message (" MinGW: define _CRT_RAND_S")
+   set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_RAND_S")
+endif ()
+
 include(CheckTypeSize)
 if (MSVC)
    SET(CMAKE_EXTRA_INCLUDE_FILES "ws2tcpip.h")
 else()
    SET(CMAKE_EXTRA_INCLUDE_FILES "sys/socket.h")
 endif ()
 CHECK_TYPE_SIZE(socklen_t HAVE_SOCKLEN)
-SET(CMAKE_EXTRA_INCLUDE_FILES) 
+SET(CMAKE_EXTRA_INCLUDE_FILES)
 
 if (HAVE_SOCKLEN)
    set(MONGOC_HAVE_SOCKLEN 1)

build/cmake/FindBSON.cmake

@@ -14,47 +14,27 @@ find_path(BSON_INCLUDE_DIR
     libbson-1.0/bson.h
   HINTS
     ${BSON_ROOT_DIR}
-    ${_BSON_INCLUDEDIR}
   PATH_SUFFIXES
     include
 )
 
 set(BSON_INCLUDE_DIR "${BSON_INCLUDE_DIR}/libbson-1.0")
 
-if(WIN32 AND NOT CYGWIN)
-  if(MSVC)
-    find_library(BSON
-      NAMES
-        "bson-1.0"
-      HINTS
-        ${BSON_ROOT_DIR}
-      PATH_SUFFIXES
-        bin
-        lib
-    )
+find_library(BSON
+  NAMES
+    "bson-1.0"
+  HINTS
+    ${BSON_ROOT_DIR}
+  PATH_SUFFIXES
+    bin
+    lib
+)
 
-    mark_as_advanced(BSON)
-    set(BSON_LIBRARIES ${BSON} ws2_32)
-  else()
-      # bother supporting this?
-  endif()
+if(WIN32)
+   set(BSON_LIBRARIES ${BSON} ws2_32)
 else()
-
-  find_library(BSON_LIBRARY
-    NAMES
-      bson-1.0
-    HINTS
-      ${_BSON_LIBDIR}
-    PATH_SUFFIXES
-      lib
-  )
-
-  mark_as_advanced(BSON_LIBRARY)
-
   find_package (Threads REQUIRED)
-
-  set(BSON_LIBRARIES ${BSON_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
-
+  set(BSON_LIBRARIES ${BSON} ${CMAKE_THREAD_LIBS_INIT})
 endif()
 
 if (BSON_INCLUDE_DIR)