merge three lib to one lib "cyclone", keep it simple!

Author: thejinchao

source/CMakeLists.txt

@@ -4,6 +4,90 @@
 
 cmake_minimum_required (VERSION 2.6)
 
-add_subdirectory(cyCore)
-add_subdirectory(cyEvent)
-add_subdirectory(cyNetwork)
+########
+#cyCore
+########
+
+set(CY_CORE_INCLUDE_FILES
+	cyCore/cy_core.h
+	cyCore/core/cyc_logger.h
+	cyCore/core/cyc_socket_api.h
+	cyCore/core/cyc_thread_api.h
+	cyCore/core/cyc_ring_buf.h
+)
+source_group("cyCore" FILES ${CY_CORE_INCLUDE_FILES})
+
+set(CY_CORE_SOURCE_FILES 
+	cyCore/core/cyc_logger.cpp
+	cyCore/core/cyc_socket_api.cpp
+	cyCore/core/cyc_thread_api.cpp
+	cyCore/core/cyc_ring_buf.cpp
+)
+source_group("cyCore" FILES ${CY_CORE_SOURCE_FILES})
+
+########
+#cyEvent
+########
+
+set(CY_EVENT_INCLUDE_FILES
+	cyEvent/cy_event.h
+	cyEvent/event/cye_looper.h
+	cyEvent/event/cye_pipe.h
+)
+source_group("cyEvent" FILES ${CY_EVENT_INCLUDE_FILES})
+
+set(CY_EVENT_SOURCE_FILES
+	cyEvent/event/cye_looper.cpp
+	cyEvent/event/cye_pipe.cpp
+)
+source_group("cyEvent" FILES ${CY_EVENT_SOURCE_FILES})
+
+set(CY_EVENT_INTERNAL_FILES
+	cyEvent/event/internal/cye_looper_select.h
+	cyEvent/event/internal/cye_looper_epoll.h
+	cyEvent/event/internal/cye_looper_select.cpp
+	cyEvent/event/internal/cye_looper_epoll.cpp
+	cyEvent/event/internal/cye_create_looper.cpp
+)
+source_group("cyEvent\\internal" FILES ${CY_EVENT_INTERNAL_FILES})
+
+########
+#cyNetwork
+########
+
+set(CY_NETWORK_INCLUDE_FILES
+	cyNetwork/cy_network.h
+	cyNetwork/network/cyn_socket.h
+	cyNetwork/network/cyn_address.h
+	cyNetwork/network/cyn_tcp_server.h
+	cyNetwork/network/cyn_connection.h
+	cyNetwork/network/cyn_work_thread.h
+)
+source_group("cyNetwork" FILES ${CY_NETWORK_INCLUDE_FILES})
+
+set(CY_NETWORK_SOURCE_FILES
+	cyNetwork/network/cyn_socket.cpp
+	cyNetwork/network/cyn_address.cpp
+	cyNetwork/network/cyn_tcp_server.cpp
+	cyNetwork/network/cyn_connection.cpp
+	cyNetwork/network/cyn_work_thread.cpp
+)
+source_group("cyNetwork" FILES ${CY_NETWORK_SOURCE_FILES})
+
+include_directories(
+	${CY_AUTO_INCLUDE_PATH}
+	${CY_SOURCE_CORE_PATH}
+	${CY_SOURCE_EVENT_PATH}
+	${CY_SOURCE_NETWORK_PATH}
+)
+
+add_library(cyclone 
+	${CY_CORE_SOURCE_FILES} 
+	${CY_CORE_INCLUDE_FILES} 
+	${CY_EVENT_INCLUDE_FILES}
+	${CY_EVENT_SOURCE_FILES}
+	${CY_EVENT_INTERNAL_FILES}
+	${CY_NETWORK_INCLUDE_FILES}
+	${CY_NETWORK_SOURCE_FILES}
+)
+

source/cyCore/CMakeLists.txt

@@ -14,40 +14,32 @@ include_directories(
 add_executable(echo-server echo_server.cpp)
 add_executable(echo-client echo_client.cpp)
 
-set_property(TARGET echo-server PROPERTY FOLDER "cy-test")
-set_property(TARGET echo-client PROPERTY FOLDER "cy-test")
+set_property(TARGET echo-server PROPERTY FOLDER "test")
+set_property(TARGET echo-client PROPERTY FOLDER "test")
 
 if(CY_SYS_LINUX)
 target_link_libraries(echo-server
-	cy-network
-	cy-event
-	cy-core
+	cyclone
 	pthread
 	rt
 )
 
 target_link_libraries(echo-client
-	cy-network
-	cy-event
-	cy-core
+	cyclone
 	pthread
 	rt
 )
 endif()
 
 if(CY_SYS_WINDOWS)
 target_link_libraries(echo-server
-	cy-network
-	cy-event
-	cy-core
+	cyclone
 	ws2_32.lib
 	shlwapi.lib
 )
 
 target_link_libraries(echo-client
-	cy-network
-	cy-event
-	cy-core
+	cyclone
 	ws2_32.lib
 	shlwapi.lib
 )