From 27a33454a47af0cba348ff73f06509c2de717158 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 4 Apr 2011 14:23:46 +0000
Subject: [PATCH] cleanup wsock dep on win
---
CMakeLists.txt | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5367b383bd..3afb63f7b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -783,16 +783,11 @@ if(MSVC)
add_definitions(-D_USE_MATH_DEFINES -DNOMINMAX
-D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE)
set(GMSH_SRC ${GMSH_SRC};Fltk/Win32Icon.rc)
- list(APPEND EXTERNAL_LIBRARIES "ws2_32.lib")
endif(MSVC)
-if(WIN32 AND NOT HAVE_FLTK)
- if(MSVC)
- list(APPEND EXTERNAL_LIBRARIES "wsock32.lib")
- ELSE(MSVC)
- list(APPEND EXTERNAL_LIBRARIES "ws2_32.lib wsock32.lib")
- ENDIF(MSVC)
-endif(WIN32 AND NOT HAVE_FLTK)
+if(WIN32)
+ list(APPEND EXTERNAL_LIBRARIES wsock32 ws2_32)
+endif(WIN32)
list(SORT CONFIG_OPTIONS)
set(GMSH_CONFIG_OPTIONS "")
--
GitLab