[many ports] Updates 2019.05.24 (#6618)
* [many ports] Updates 2019.05.24
* Update SHA512 and resolve conflict for ebml and matroska
* [avro-c]Fix build error caused by jansson upgrades.
* [xxhash]Update to the next version to fix build error.(xxhash issue:#179)
* Fix failures and undo asio
* [libyaml, grpc, miniz, paho-mqtt, sqlitecpp] Update patches
* Update REF
* Undo nvtt flann itk libtins aws-sdk-cpp openvdb vlpp xmsh changes
* [flann, fastcdr] Fix old patches and build error.
* [flann, fastcdr] Fix build error.
* Fix ensmallen uvatlas cppcms libplist failures and undo aws-c-common libopusenc arb taglib changes
* [dcmtk, draco, flatbuffers, forge, ftgl, mosquitto,nmslib, ogre] Update old patches and fix build error.
* fix libusbmuxd failures and undo xxhash paho-mqtt mongo-c-driver flann libffi
* fix libimobiledevice and undo qhull harfbuzz lcm libbson draco flatbuffers
* undo libmupdf forge kd-soap qca
* [mosquitto] Fix installation of import libs
* [arb][asio][aws-c-common][collada-dom][concurrentqueue][cryptopp][ebml] Revert trivial/undesired changes
* [fastcdr] Minimize patch
* [many ports] Revert trivial changes
* [libyaml] Switch to non-dist tag
* [sqlite-modern-cpp] Track master due to infrequent release
* [nano-signal-slot] Revert downgrade
* [openvpn3] Bump control version to account for portfile change
* [sqlite-modern-cpp] Fixup wrong hash
* [mosquitto] Commit missing patch
2019-06-11 08:01:54 +08:00
|
|
|
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)
|
2018-07-04 12:22:34 +08:00
|
|
|
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)
|
2019-05-17 04:49:25 +08:00
|
|
|
+ find_package(pthread REQUIRED)
|
2018-07-04 12:22:34 +08:00
|
|
|
else (WIN32)
|
|
|
|
|
find_library(LIBPTHREAD pthread)
|
|
|
|
|
if (LIBPTHREAD)
|
[many ports] Updates 2019.05.24 (#6618)
* [many ports] Updates 2019.05.24
* Update SHA512 and resolve conflict for ebml and matroska
* [avro-c]Fix build error caused by jansson upgrades.
* [xxhash]Update to the next version to fix build error.(xxhash issue:#179)
* Fix failures and undo asio
* [libyaml, grpc, miniz, paho-mqtt, sqlitecpp] Update patches
* Update REF
* Undo nvtt flann itk libtins aws-sdk-cpp openvdb vlpp xmsh changes
* [flann, fastcdr] Fix old patches and build error.
* [flann, fastcdr] Fix build error.
* Fix ensmallen uvatlas cppcms libplist failures and undo aws-c-common libopusenc arb taglib changes
* [dcmtk, draco, flatbuffers, forge, ftgl, mosquitto,nmslib, ogre] Update old patches and fix build error.
* fix libusbmuxd failures and undo xxhash paho-mqtt mongo-c-driver flann libffi
* fix libimobiledevice and undo qhull harfbuzz lcm libbson draco flatbuffers
* undo libmupdf forge kd-soap qca
* [mosquitto] Fix installation of import libs
* [arb][asio][aws-c-common][collada-dom][concurrentqueue][cryptopp][ebml] Revert trivial/undesired changes
* [fastcdr] Minimize patch
* [many ports] Revert trivial changes
* [libyaml] Switch to non-dist tag
* [sqlite-modern-cpp] Track master due to infrequent release
* [nano-signal-slot] Revert downgrade
* [openvpn3] Bump control version to account for portfile change
* [sqlite-modern-cpp] Fixup wrong hash
* [mosquitto] Commit missing patch
2019-06-11 08:01:54 +08:00
|
|
|
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
|