Merge Pull Request #9849 from sskutnik/Trilinos/fix_ml_socket_windows

Automatically Merged using Trilinos Pull Request AutoTester PR Title: ML: Fix socket references for Windows builds PR Author: sskutnik
trilinos · Oct 23, 2021 · 9c42161 · 9c42161
2 parents 3b37d42 + 511cf50
commit 9c42161
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/packages/ml/src/CMakeLists.txt b/packages/ml/src/CMakeLists.txt
@@ -329,3 +329,7 @@ TRIBITS_ADD_LIBRARY(
   HEADERS ${HEADERS}
   SOURCES ${SOURCES}
   )
+
+if (WIN32)
+	target_link_libraries (ml PUBLIC ws2_32)
+endif ()
diff --git a/packages/ml/src/MLAPI/MLAPI_Workspace.cpp b/packages/ml/src/MLAPI/MLAPI_Workspace.cpp
@@ -16,6 +16,10 @@
 #ifdef _MSC_VER
 #include "winprocess.h"
 #endif
+#include <unistd.h>
+#ifdef _WIN32
+#include <winsock2.h>
+#endif
 
 namespace MLAPI {
 

diff --git a/packages/ml/src/Utils/ml_epetra_utils.cpp b/packages/ml/src/Utils/ml_epetra_utils.cpp
@@ -43,6 +43,10 @@
 #ifdef _MSC_VER
 # include "winprocess.h"
 #endif
+#include <unistd.h>
+#ifdef _WIN32
+#include <winsock2.h>
+#endif
 
 #ifdef HAVE_ML_TEUCHOS
 using namespace Teuchos;
@@ -52,7 +56,6 @@ using namespace Teuchos;
 #include "EpetraExt_MatrixMatrix.h"
 #endif
 
-
 // ======================================================================
 
 typedef struct {