From d725299ad11701cfe2e589baa083f7ce9d17e73e Mon Sep 17 00:00:00 2001
From: flaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Wed, 13 Jul 2011 01:58:32 +0000
Subject: [PATCH] * CMake: added search for ws2_32 library. (tested with
 MinGW/MSYS) * Added missing pcre library for MinGW.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14904 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 3rdparty/msinttypes/CMakeLists.txt |   2 +-
 3rdparty/pcre/lib/libpcre.dll.a    | Bin 0 -> 19068 bytes
 CMakeLists.txt                     |  18 ++++++++++--------
 Changelog-Trunk.txt                |   2 ++
 4 files changed, 13 insertions(+), 9 deletions(-)
 create mode 100644 3rdparty/pcre/lib/libpcre.dll.a

diff --git a/3rdparty/msinttypes/CMakeLists.txt b/3rdparty/msinttypes/CMakeLists.txt
index f7a662fe8f..c11c1d72a1 100644
--- a/3rdparty/msinttypes/CMakeLists.txt
+++ b/3rdparty/msinttypes/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-if( WIN32 )
+if( MSVC )
 find_path( MSINTTYPES_INCLUDE_DIRS "inttypes.h"
 	PATHS "${CMAKE_CURRENT_SOURCE_DIR}/include"
 	NO_DEFAULT_PATH )
diff --git a/3rdparty/pcre/lib/libpcre.dll.a b/3rdparty/pcre/lib/libpcre.dll.a
new file mode 100644
index 0000000000000000000000000000000000000000..fe69e4e5771766bd0b47cce01f0b71587dd0934c
GIT binary patch
literal 19068
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

literal 0
HcmV?d00001

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41752f4898..2960b822d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,10 +41,12 @@ elseif( "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}" )
 		"Do not use the source directory to build your files, instead delete CMakeCache.txt, create a separate folder and build there.\n"
 		"Example: (build in subdir 'build' and install to source dir)\n"
 		"  rm -f CMakeCache.txt\n"
-		"  mkdir build && cd build\n"
+		"  mkdir build\n"
+		"  cd build\n"
 		"  cmake -G\"Unix Makefiles\" -DINSTALL_TO_SOURCE=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo ..\n"
 		"  make install\n"
-		"  cd .. && rm -rf build\n"
+		"  cd ..\n"
+		"  rm -rf build\n"
 		"To skip this check, set ALLOW_SAME_DIRECTORY to ON (-DALLOW_SAME_DIRECTORY=ON)" )
 endif()
 
@@ -58,9 +60,9 @@ set( GLOBAL_DEFINITIONS ${COMPILE_DEFINITIONS}  CACHE INTERNAL "" )# string (spa
 mark_as_advanced( GLOBAL_LIBRARIES  GLOBAL_INCLUDE_DIRS  GLOBAL_DEFINITIONS )
 if( WIN32 )
 	set_property( CACHE GLOBAL_DEFINITIONS  PROPERTY VALUE "${GLOBAL_DEFINITIONS} -DFD_SETSIZE=4096" )
-	set_property( CACHE GLOBAL_LIBRARIES    PROPERTY VALUE ${GLOBAL_LIBRARIES} "oldnames.lib" "ws2_32.lib" )
 endif()
 if( MSVC )
+	set_property( CACHE GLOBAL_LIBRARIES    PROPERTY VALUE ${GLOBAL_LIBRARIES} "oldnames.lib" "ws2_32.lib" )
 	set_property( CACHE GLOBAL_DEFINITIONS  PROPERTY VALUE "${GLOBAL_DEFINITIONS} -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DDB_MANUAL_CAST_TO_UNION" )
 endif()
 
@@ -158,12 +160,12 @@ endif()
 
 
 #
-# socket/nsl library (Solaris)
+# socket/nsl/ws2_32 library (Solaris/MinGW)
 #
-if( NOT WIN32 )
-message( STATUS "Detecting socket/nsl library (networking)" )
+if( NOT MSVC )
+message( STATUS "Detecting socket/nsl/ws2_32 library (networking)" )
 set( CMAKE_REQUIRED_LIBRARIES ${GLOBAL_LIBRARIES} )
-find_function_library( bind FUNCTION_BIND_LIBRARIES socket )
+find_function_library( bind FUNCTION_BIND_LIBRARIES socket ws2_32 )
 if( FUNCTION_BIND_LIBRARIES )
 	message( STATUS "Adding global library: ${FUNCTION_BIND_LIBRARIES}" )
 	list( APPEND GLOBAL_LIBRARIES ${FUNCTION_BIND_LIBRARIES} )
@@ -174,7 +176,7 @@ if( FUNCTION_GETHOSTBYNAME_LIBRARIES )
 	message( STATUS "Adding global library: ${FUNCTION_GETHOSTBYNAME_LIBRARIES}" )
 	list( APPEND GLOBAL_LIBRARIES ${FUNCTION_GETHOSTBYNAME_LIBRARIES} )
 endif()
-message( STATUS "Detecting socket/nsl library (networking) - done" )
+message( STATUS "Detecting socket/nsl/ws2_32 library (networking) - done" )
 endif()
 
 
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 14ec4601f8..3d5d325770 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ Date	Added
 	* CMake: set project language to C, added module FindFunctionLibrary, added search for dl library. (tested with debian-wheezy-i386) [FlavioJS]
 	* CMake: added search for math.h, added search for socket/nsl library. (tested with Solaris-201011-x86)
 	* Added missing include to socket.c.
+	* CMake: added search for ws2_32 library. (tested with MinGW/MSYS)
+	* Added missing pcre library for MinGW.
 2011/07/11
 	* Rev. 14901 Added bonus3 bAddClassDropItem, care of Epoque. [L0ne_W0lf]
 2011/07/10