Updated winsock search

CMakeLists.txt

@@ -277,8 +277,8 @@ endif()
 
 
 if(IS_WINDOWS)
-	find_library(WS2_32 ws2_32)
-	find_library(WSOCK32 wsock32)
+	set(WS2_32 ws2_32)
+	set(WSOCK32 wsock32)
 else()
 	check_function_exists(dlopen CPPCMS_HAVE_DLOPEN)
 	if(NOT CPPCMS_HAVE_DLOPEN)
@@ -423,7 +423,7 @@ endif()
 
 if(NOT DISABLE_OPENSSL)
 	find_path(OPENSSL_INCLUDE_DIR openssl/aes.h)
-	find_library(LIB_OPENSSL NAMES crypto libeay32)
+	find_library(LIB_OPENSSL NAMES crypto libcrypto libeay32)
 endif()
 
 if(GCRYPT_INCLUDE_DIR AND LIB_GCRYPT)

booster/CMakeLists.txt

@@ -58,7 +58,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
 else()
 	option(DISABLE_STD_LOCALE	"Disable std locale backend" OFF)
 endif()
-option(USE_WINDOWS6_API		"Use Windows 6 API (Vista, 7)" OFF)
+option(USE_WINDOWS6_API		"Use Windows 6 API (Vista, 7)" ON)
 
 check_function_exists(newlocale BOOSTER_HAS_XLOCALE)
 
@@ -131,7 +131,7 @@ if(NOT DISABLE_ICU_LOCALE)
 	endif()
 
 	find_library(ICU_UC icuuc${ICU_SUFFIX})
-	find_library(ICU_DATA NAMES icudt icudata)
+	find_library(ICU_DATA NAMES icudt${ICU_SUFFIX} icudata)
 	find_library(ICU_I18N NAMES icuin${ICU_SUFFIX} icui18n${ICU_SUFFIX})
 	find_path(ICU_INCLUDE_DIR unicode/unistr.h)
 
@@ -276,7 +276,7 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
 endif()
 
 if(IS_WINDOWS)
-	find_library(WS2_32 ws2_32)
+	set(WS2_32 ws2_32)
 else()
 	check_function_exists(socket HAVE_SOCKET)
 	if(NOT HAVE_SOCKET)