Fixed extern C issue with windows headers, fixed a GEN-ZAM regex issue, fixd compilation with c-ares

CMakeLists.txt

@@ -90,9 +90,10 @@ if ( MSVC )
 
     # Set CAres
     find_package(c-ares)
-    set(HAVE_CARES true)
-    set(zeekdeps ${zeekdeps} ${c-ares_LIBRARIES})
+    set(HAVE_CARES true) # Disable FindCAres cmake file
     include_directories(BEFORE ${c-ares_INCLUDE_DIRS})
+    set(zeekdeps ${zeekdeps} ${c-ares_LIBRARIES})
+    add_definitions(-DCARES_STATICLIB)
 
     add_subdirectory(auxil/libunistd)
     set(UNISTD_INCLUDES ${CMAKE_SOURCE_DIR}/auxil/libunistd/unistd ${CMAKE_SOURCE_DIR}/auxil/libunistd/regex)

src/CMakeLists.txt

@@ -533,6 +533,7 @@ if (ZEEK_STANDALONE)
                    ${bro_PLUGIN_LIBS}
     )
     target_link_libraries(zeek ${bro_PLUGIN_LINK_LIBS} ${zeekdeps} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
+    
     # Export symbols from zeek executable for use by plugins
     set_target_properties(zeek PROPERTIES ENABLE_EXPORTS TRUE)
 

src/telemetry/CMakeLists.txt

@@ -13,3 +13,4 @@ bif_target(telemetry.bif)
 
 bro_add_subdir_library(telemetry ${telemetry_SRCS})
 add_dependencies(bro_telemetry generate_outputs)
+