File tree Expand file tree Collapse file tree 1 file changed +4
-5
lines changed
Expand file tree Collapse file tree 1 file changed +4
-5
lines changed Original file line number Diff line number Diff line change @@ -82,9 +82,6 @@ find_package(libevhtp REQUIRED)
8282
8383find_path (LIBEVENT_INCLUDE_DIR event2/event.h REQUIRED)
8484
85- set (IMAGEMAGICK_INCLUDE_DIRS ${ImageMagick_INCLUDE_DIRS} )
86- set (IMAGEMAGICK_LIBRARIES ${ImageMagick_LIBRARIES} )
87-
8885if (NOT OPENSSL_FOUND)
8986 message ("Diabling SSL" )
9087 set (EVHTP_DISABLE_SSL ON )
@@ -99,17 +96,19 @@ include_directories(
9996 ${CMAKE_CURRENT_SOURCE_DIR}
10097 ${OPENSSL_INCLUDE_DIR}
10198 ${LIBEVENT_INCLUDE_DIR}
102- ${ImageMagick_MagickWand_INCLUDE_DIR}
99+ ${LIBEVHTP_INCLUDE_DIR}
100+ ${ImageMagick_INCLUDE_DIRS}
101+ ${LIBMEMCACHED_INCLUDE_DIR}
103102)
104103
105104set (ZIMG_EXTERNAL_LIBS
105+ ${LIBEVENT_LIBRARY}
106106 ${LIBEVENT_LIBRARY}
107107 ${LIBEVENT_PTHREADS_LIBRARY}
108108 ${LIBEVENT_OPENSSL_LIBRARY}
109109 ${OPENSSL_LIBRARIES}
110110 ${ImageMagick_MagickWand_LIBRARY}
111111 ${LIBEVHTP_LIBRARY}
112- ${LIBEVENT_LIBRARY}
113112 ${LIBMEMCACHED_LIBRARY}
114113)
115114
You can’t perform that action at this time.
0 commit comments