fix:1.12.1 解决CMake安装后的目前结构有错的问题

Author: hevake

modules/flow/CMakeLists.txt

@@ -29,33 +29,6 @@ add_definitions(-DMODULE_ID="tbox.flow")
 
 set(TBOX_LIBRARY_NAME tbox_flow)
 
-set(TBOX_FLOW_HEADERS
-    state_machine.h
-    action.h
-    action_reason.h
-    event.h
-    action_executor.h
-    event_subscriber.h
-    event_publisher.h
-    event_publisher_impl.h
-    actions/assemble_action.h
-    actions/function_action.h
-    actions/sleep_action.h
-    actions/sequence_action.h
-    actions/parallel_action.h
-    actions/if_else_action.h
-    actions/if_then_action.h
-    actions/loop_action.h
-    actions/loop_if_action.h
-    actions/event_action.h
-    actions/repeat_action.h
-    actions/composite_action.h
-    actions/wrapper_action.h
-    actions/succ_fail_action.h
-    actions/dummy_action.h
-    actions/switch_action.h
-    to_graphviz.h)
-
 set(TBOX_FLOW_SOURCES
     state_machine.cpp
     action.cpp
@@ -126,10 +99,39 @@ install(
 
 # install header file
 install(
-    FILES ${TBOX_FLOW_HEADERS}
+    FILES
+    state_machine.h
+    action.h
+    action_reason.h
+    event.h
+    action_executor.h
+    event_subscriber.h
+    event_publisher.h
+    event_publisher_impl.h
+    to_graphviz.h
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tbox/flow
 )
 
+install(
+    FILES
+    actions/assemble_action.h
+    actions/function_action.h
+    actions/sleep_action.h
+    actions/sequence_action.h
+    actions/parallel_action.h
+    actions/if_else_action.h
+    actions/if_then_action.h
+    actions/loop_action.h
+    actions/loop_if_action.h
+    actions/event_action.h
+    actions/repeat_action.h
+    actions/composite_action.h
+    actions/wrapper_action.h
+    actions/succ_fail_action.h
+    actions/dummy_action.h
+    actions/switch_action.h
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tbox/flow/actions
+)
 
 # generate and install export file
 install(

modules/http/CMakeLists.txt

@@ -29,18 +29,6 @@ add_definitions(-DMODULE_ID="tbox.http")
 
 set(TBOX_LIBRARY_NAME tbox_http)
 
-set(TBOX_HTTP_HEADERS
-    common.h
-    request.h
-    respond.h
-    url.h
-    server/types.h
-    server/server.h
-    server/context.h
-    server/middleware.h
-    server/router.h
-    client/client.h)
-
 set(TBOX_HTTP_SOURCES
     common.cpp
     request.cpp
@@ -87,10 +75,29 @@ install(
 
 # install header file
 install(
-    FILES ${TBOX_HTTP_HEADERS}
+    FILES
+    common.h
+    request.h
+    respond.h
+    url.h
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tbox/http
 )
 
+install(
+    FILES
+    server/types.h
+    server/server.h
+    server/context.h
+    server/middleware.h
+    server/router.h
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tbox/http/server
+)
+
+install(
+    FILES
+    client/client.h
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tbox/http/client
+)
 
 # generate and install export file
 install(

modules/jsonrpc/CMakeLists.txt

@@ -27,13 +27,6 @@ add_definitions(-DMODULE_ID="tbox.jsonrpc")
 
 set(TBOX_LIBRARY_NAME tbox_jsonrpc)
 
-set(TBOX_JSONRPC_HEADERS
-    proto.h
-    protos/raw_stream_proto.h
-    protos/header_stream_proto.h
-    protos/packet_proto.h
-    rpc.h)
-
 set(TBOX_JSONRPC_SOURCES
     proto.cpp
     protos/raw_stream_proto.cpp
@@ -76,10 +69,17 @@ install(
 
 # install header file
 install(
-    FILES ${TBOX_JSONRPC_HEADERS}
+    FILES proto.h rpc.h
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tbox/jsonrpc
 )
 
+install(
+    FILES
+    protos/raw_stream_proto.h
+    protos/header_stream_proto.h
+    protos/packet_proto.h
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tbox/jsonrpc/protos
+)
 
 # generate and install export file
 install(

version.mk

@@ -21,4 +21,4 @@
 # TBOX版本号
 TBOX_VERSION_MAJOR := 1
 TBOX_VERSION_MINOR := 12
-TBOX_VERSION_REVISION := 0
+TBOX_VERSION_REVISION := 1