Fix issue #49. Add evpp/httpc/*.h to packages

Qihoo360 · Jun 21, 2017 · 63a3c21 · 63a3c21
1 parent 47ef4df
commit 63a3c21
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/evpp/CMakeLists.txt b/evpp/CMakeLists.txt
@@ -4,6 +4,7 @@ file(GLOB evpp_lite_SRCS *.cc *.h httpc/*.*)
 list(REMOVE_ITEM evpp_lite_SRCS tcp_server.h tcp_server.cc listener.h listener.cc event_loop_thread.h event_loop_thread.cc event_loop_thread_pool.h event_loop_thread_pool.cc)
 file(GLOB evpp_PUBLIC_HEADERS *.h)
 file(GLOB evpp_HTTP_PUBLIC_HEADERS http/*.h)
+file(GLOB evpp_HTTPC_PUBLIC_HEADERS httpc/*.h)
 file(GLOB evpp_UDP_PUBLIC_HEADERS udp/*.h)
 
 message(STATUS "evpp_SRCS : " ${evpp_SRCS})
@@ -54,22 +55,17 @@ if (UNIX)
       LIBRARY DESTINATION lib
       ARCHIVE DESTINATION lib)
 
-    install (FILES ${evpp_PUBLIC_HEADERS} DESTINATION "include/evpp")
-    install (FILES ${evpp_HTTP_PUBLIC_HEADERS} DESTINATION "include/evpp/http")
-    install (FILES ${evpp_UDP_PUBLIC_HEADERS} DESTINATION "include/evpp/udp")
-
 else (UNIX)
-	link_directories(${PROJECT_SOURCE_DIR}/vsprojects/bin/${CMAKE_BUILD_TYPE})
-
     install (
       TARGETS evpp_static evpp_lite_static
       EXPORT ${PACKAGE_NAME}
       RUNTIME DESTINATION bin
       LIBRARY DESTINATION lib
       ARCHIVE DESTINATION lib)
 
-    install (FILES ${evpp_PUBLIC_HEADERS} DESTINATION "include/evpp")
-    install (FILES ${evpp_HTTP_PUBLIC_HEADERS} DESTINATION "include/evpp/http")
-    install (FILES ${evpp_UDP_PUBLIC_HEADERS} DESTINATION "include/evpp/udp")
 endif (UNIX)
 
+install (FILES ${evpp_PUBLIC_HEADERS} DESTINATION "include/evpp")
+install (FILES ${evpp_HTTP_PUBLIC_HEADERS} DESTINATION "include/evpp/http")
+install (FILES ${evpp_HTTPC_PUBLIC_HEADERS} DESTINATION "include/evpp/httpc")
+install (FILES ${evpp_UDP_PUBLIC_HEADERS} DESTINATION "include/evpp/udp")