From 87e983a3b80f64c0459a3af8b656c26972dcccdf Mon Sep 17 00:00:00 2001
From: Thomas PRAMPART <thomas.prampart@inria.fr>
Date: Mon, 18 Dec 2023 10:30:01 +0000
Subject: [PATCH] Update windows winsock linking
---
modules/socket/CMakeLists.txt | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/modules/socket/CMakeLists.txt b/modules/socket/CMakeLists.txt
index 878aa2093..592b097d9 100644
--- a/modules/socket/CMakeLists.txt
+++ b/modules/socket/CMakeLists.txt
@@ -9,6 +9,10 @@ add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
target_link_libraries(${PROJECT_NAME}
openvibe-common)
+if (WIN32)
+ target_link_libraries(${PROJECT_NAME} ws2_32)
+endif(WIN32)
+
target_include_directories(${PROJECT_NAME}
PRIVATE include/socket
PUBLIC include)
@@ -24,22 +28,6 @@ target_compile_options(${PROJECT_NAME}
PUBLIC -DSocket_Shared
)
-# ---------------------------------
-# Finds standard library winsock
-# Adds library to target
-# Adds include path
-# ---------------------------------
-if(WIN32)
- include("OvSetWindowsSDKPath")
- find_library(LIB_STANDARD_MODULE_WINSOCK ws2_32 ${OV_MS_SDK_PATH}/lib)
- if(LIB_STANDARD_MODULE_WINSOCK)
- message(STATUS " Found ws2_32...")
- target_link_libraries(${PROJECT_NAME} ${LIB_STANDARD_MODULE_WINSOCK})
- else(LIB_STANDARD_MODULE_WINSOCK)
- message(STATUS " FAILED to find ws2_32...")
- endif(LIB_STANDARD_MODULE_WINSOCK)
-endif(WIN32)
-
# ---------------------------------
# Target macros
# Defines target operating system, architecture and compiler
--
GitLab