From b056ab7e0a74af03ec6bfea97c0aa70689b3d6b9 Mon Sep 17 00:00:00 2001
From: wangguibao <wangguibao@baidu.com>
Date: Thu, 28 Mar 2019 14:35:50 +0800
Subject: [PATCH] Adjust CMake output structure

Change-Id: I236f8bb08ed8ed6d09e8810c858c0e807678bde5
---
 configure/CMakeLists.txt |  6 ++++++
 predictor/CMakeLists.txt | 11 +++++++++++
 sdk-cpp/CMakeLists.txt   |  6 +++++-
 serving/CMakeLists.txt   |  5 +++++
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/configure/CMakeLists.txt b/configure/CMakeLists.txt
index 66b395a1..e14b875e 100644
--- a/configure/CMakeLists.txt
+++ b/configure/CMakeLists.txt
@@ -19,3 +19,9 @@ target_link_libraries(test_configure configure protobuf)
 install(TARGETS configure 
         ARCHIVE DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/lib
         )
+install(FILES ${CMAKE_CURRENT_LIST_DIR}/include/configure_parser.h
+        DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/include/configure/include)
+
+FILE(GLOB inc ${CMAKE_CURRENT_BINARY_DIR}/*.pb.h)
+install(FILES ${inc}
+        DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/include/configure)
diff --git a/predictor/CMakeLists.txt b/predictor/CMakeLists.txt
index c793e28c..251dd208 100644
--- a/predictor/CMakeLists.txt
+++ b/predictor/CMakeLists.txt
@@ -22,3 +22,14 @@ install(TARGETS pdserving
         ARCHIVE DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/lib
         LIBRARY DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/so
         )
+
+FILE(GLOB inc_common ${CMAKE_CURRENT_LIST_DIR}/common/*.h)
+install(FILES ${inc_common}
+        DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/include/predictor/common)
+
+FILE(GLOB inc_framework ${CMAKE_CURRENT_LIST_DIR}/framework/*.h)
+install(FILES ${inc_framework}
+        DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/include/predictor/framework)
+
+install(FILES ${CMAKE_CURRENT_LIST_DIR}/mempool/mempool.h
+        DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/include/predictor/mempool)
diff --git a/sdk-cpp/CMakeLists.txt b/sdk-cpp/CMakeLists.txt
index fd548764..92485382 100644
--- a/sdk-cpp/CMakeLists.txt
+++ b/sdk-cpp/CMakeLists.txt
@@ -99,4 +99,8 @@ install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/data/text_classification DESTINATION
         ${PADDLE_SERVING_INSTALL_DIR}/demo/client/text_classification/data)
 
 install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/include
-        DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/)
+        DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/include/sdk-cpp/)
+
+FILE(GLOB inc ${CMAKE_CURRENT_BINARY_DIR}/*.pb.h)
+install(FILES ${inc}
+        DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/include/sdk-cpp)
diff --git a/serving/CMakeLists.txt b/serving/CMakeLists.txt
index c42ffee5..f9c6cab6 100644
--- a/serving/CMakeLists.txt
+++ b/serving/CMakeLists.txt
@@ -33,6 +33,11 @@ install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/conf DESTINATION
         ${PADDLE_SERVING_INSTALL_DIR}/demo/serving/)
 install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/data DESTINATION
         ${PADDLE_SERVING_INSTALL_DIR}/demo/serving/)
+
+FILE(GLOB inc ${CMAKE_CURRENT_BINARY_DIR}/*.pb.h)
+install(FILES ${inc}
+        DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/include/serving)
+
 if (${WITH_MKL})
         install(FILES ${THIRD_PARTY_PATH}/install/mklml/lib/libmklml_intel.so
                 ${THIRD_PARTY_PATH}/install/mklml/lib/libmklml_gnu.so
-- 
GitLab