buaazp: modify cmakelist.txt

buaazp · Apr 8, 2014 · fcd4f16 · fcd4f16
1 parent 3354962
commit fcd4f16
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -82,9 +82,6 @@ find_package(libevhtp REQUIRED)
 
 find_path(LIBEVENT_INCLUDE_DIR event2/event.h REQUIRED)
 
-set(IMAGEMAGICK_INCLUDE_DIRS ${ImageMagick_INCLUDE_DIRS})
-set(IMAGEMAGICK_LIBRARIES ${ImageMagick_LIBRARIES})
-
 if (NOT OPENSSL_FOUND)
 	message("Diabling SSL")
 	set (EVHTP_DISABLE_SSL ON)
@@ -99,17 +96,19 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}
 	${OPENSSL_INCLUDE_DIR}
 	${LIBEVENT_INCLUDE_DIR}
-    ${ImageMagick_MagickWand_INCLUDE_DIR}
+    ${LIBEVHTP_INCLUDE_DIR}
+    ${ImageMagick_INCLUDE_DIRS}
+    ${LIBMEMCACHED_INCLUDE_DIR}
 )
 
 set(ZIMG_EXTERNAL_LIBS
+        ${LIBEVENT_LIBRARY}
 		${LIBEVENT_LIBRARY}
 		${LIBEVENT_PTHREADS_LIBRARY}
 		${LIBEVENT_OPENSSL_LIBRARY}
 		${OPENSSL_LIBRARIES}
         ${ImageMagick_MagickWand_LIBRARY}
         ${LIBEVHTP_LIBRARY}
-        ${LIBEVENT_LIBRARY}
         ${LIBMEMCACHED_LIBRARY}
 )