vcpkg/ports/hiredis/fix-feature-example.patch

77 lines
2.1 KiB
Diff
Raw Normal View History

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index dd3a313..0df75d5 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -19,10 +19,17 @@ if (LIBEV)
TARGET_LINK_LIBRARIES(example-libev hiredis ev)
ENDIF()
-FIND_PATH(LIBEVENT event.h)
-if (LIBEVENT)
+FIND_PACKAGE(Libevent CONFIG REQUIRED)
+FIND_PATH(LIBEVENT_INCLUDES evutil.h)
+if (BUILD_SHARED_LIBS)
+ set(LIBEVENT_LIBS ${LIBEVENT_SHARED_LIBRARIES})
+else()
+ set(LIBEVENT_LIBS ${LIBEVENT_STATIC_LIBRARIES})
+endif()
+if (UNIX)
ADD_EXECUTABLE(example-libevent example-libevent)
- TARGET_LINK_LIBRARIES(example-libevent hiredis event)
+ TARGET_LINK_LIBRARIES(example-libevent hiredis ${LIBEVENT_LIBS})
+ TARGET_INCLUDE_DIRECTORIES(example-libevent PRIVATE ${LIBEVENT_INCLUDES})
ENDIF()
FIND_PATH(LIBUV uv.h)
@@ -38,9 +45,17 @@ IF (APPLE)
ENDIF()
IF (ENABLE_SSL)
+ FIND_PACKAGE(OpenSSL REQUIRED)
+ IF (WIN32)
+ FIND_PACKAGE(pthreads REQUIRED)
+ SET(THREADS_LIBS PThreads4W::PThreads4W)
+ ELSE()
+ FIND_PACKAGE(Threads)
+ SET(THREADS_LIBS ${CMAKE_THREAD_LIBS_INIT})
+ ENDIF()
ADD_EXECUTABLE(example-ssl example-ssl.c)
- TARGET_LINK_LIBRARIES(example-ssl hiredis hiredis_ssl)
+ TARGET_LINK_LIBRARIES(example-ssl hiredis hiredis_ssl OpenSSL::SSL OpenSSL::Crypto ${THREADS_LIBS})
ENDIF()
ADD_EXECUTABLE(example example.c)
-TARGET_LINK_LIBRARIES(example hiredis)
+TARGET_LINK_LIBRARIES(example hiredis ${LIBEVENT_LIBS})
\ No newline at end of file
diff --git a/examples/example-ssl.c b/examples/example-ssl.c
index 81f4648..9f42923 100644
--- a/examples/example-ssl.c
+++ b/examples/example-ssl.c
@@ -1,6 +1,10 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#ifdef _WIN32
+#include <Winsock2.h>
+#include <Windows.h>
+#endif
#include <hiredis.h>
#include <hiredis_ssl.h>
diff --git a/examples/example.c b/examples/example.c
index 0e93fc8..339e322 100644
--- a/examples/example.c
+++ b/examples/example.c
@@ -1,6 +1,10 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#ifdef _WIN32
+#include <Winsock2.h>
+#include <Windows.h>
+#endif
#include <hiredis.h>