mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-24 05:17:56 +08:00
8d0f86cad7
* Remove patch for ssize_t definition issue resolved upstream
32 lines
939 B
Diff
32 lines
939 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index e58d072..e582a25 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -54,12 +54,7 @@ option(WITH_THREADING "Include client library threading support?" ON)
|
|
if (WITH_THREADING)
|
|
add_definitions("-DWITH_THREADING")
|
|
if (WIN32)
|
|
- if (CMAKE_CL_64)
|
|
- set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x64\\pthreadVC2.lib)
|
|
- else (CMAKE_CL_64)
|
|
- set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x86\\pthreadVC2.lib)
|
|
- endif (CMAKE_CL_64)
|
|
- set (PTHREAD_INCLUDE_DIR C:\\pthreads\\Pre-built.2\\include)
|
|
+ find_package(pthread REQUIRED)
|
|
else (WIN32)
|
|
find_library(LIBPTHREAD pthread)
|
|
if (LIBPTHREAD)
|
|
diff --git a/config.h b/config.h
|
|
index b7a7616..bceb92a 100644
|
|
--- a/config.h
|
|
+++ b/config.h
|
|
@@ -27,7 +27,7 @@
|
|
# define EPROTO ECONNABORTED
|
|
#endif
|
|
|
|
-#ifdef WIN32
|
|
+#if defined(WIN32) || defined(WIN64)
|
|
# ifndef strcasecmp
|
|
# define strcasecmp strcmpi
|
|
# endif
|