From e9b51a9912a4cd7317e4704a044d2c4f87569700 Mon Sep 17 00:00:00 2001
From: Ybjjwwang <wangjiawei04@baidu.com>
Date: Thu, 5 Aug 2021 03:47:38 +0000
Subject: [PATCH] fix cube cmake

---
 core/cube/CMakeLists.txt                   |  6 ++----
 core/cube/cube-agent/CMakeLists.txt        |  1 -
 core/cube/cube-agent/src/CMakeLists.txt    |  1 +
 core/cube/cube-transfer/CMakeLists.txt     | 14 ++++++++------
 core/cube/cube-transfer/src/CMakeLists.txt |  7 ++++---
 python/CMakeLists.txt                      |  1 -
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/core/cube/CMakeLists.txt b/core/cube/CMakeLists.txt
index f9dc4d2c..a61d2df9 100644
--- a/core/cube/CMakeLists.txt
+++ b/core/cube/CMakeLists.txt
@@ -11,10 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License
-
-#execute_process(COMMAND go env -w GO111MODULE=off)
 add_subdirectory(cube-server)
 add_subdirectory(cube-api)
 add_subdirectory(cube-builder)
-#add_subdirectory(cube-transfer)
-#add_subdirectory(cube-agent)
+add_subdirectory(cube-transfer)
+add_subdirectory(cube-agent)
diff --git a/core/cube/cube-agent/CMakeLists.txt b/core/cube/cube-agent/CMakeLists.txt
index 30158aa5..701f0c8a 100644
--- a/core/cube/cube-agent/CMakeLists.txt
+++ b/core/cube/cube-agent/CMakeLists.txt
@@ -15,7 +15,6 @@
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 project(cube-agent Go)
-
 include(cmake/golang.cmake)
 
 ExternalGoProject_Add(agent-docopt-go github.com/docopt/docopt-go)
diff --git a/core/cube/cube-agent/src/CMakeLists.txt b/core/cube/cube-agent/src/CMakeLists.txt
index eb192f0f..834a8bbc 100644
--- a/core/cube/cube-agent/src/CMakeLists.txt
+++ b/core/cube/cube-agent/src/CMakeLists.txt
@@ -14,6 +14,7 @@
 
 set(SOURCE_FILE cube-agent.go)
 add_go_executable(cube-agent ${SOURCE_FILE})
+add_dependencies(cube-agent paddle_python)
 add_dependencies(cube-agent agent-docopt-go)
 add_dependencies(cube-agent agent-logex)
 add_dependencies(cube-agent agent-pipeline)
diff --git a/core/cube/cube-transfer/CMakeLists.txt b/core/cube/cube-transfer/CMakeLists.txt
index 78e47c5b..cd1977b0 100644
--- a/core/cube/cube-transfer/CMakeLists.txt
+++ b/core/cube/cube-transfer/CMakeLists.txt
@@ -18,11 +18,13 @@ project(cube-transfer Go)
 
 include(cmake/golang.cmake)
 
-ExternalGoProject_Add(rfw github.com/mipearson/rfw)
-ExternalGoProject_Add(docopt-go github.com/docopt/docopt-go)  
-add_custom_target(logex
-                  COMMAND env GOPATH=${GOPATH} ${CMAKE_Go_COMPILER} get github.com/Badangel/logex
-                  DEPENDS rfw)
+ExternalGoProject_Add(transfer-rfw github.com/mipearson/rfw)
+ExternalGoProject_Add(transfer-docopt-go github.com/docopt/docopt-go)  
+ExternalGoProject_Add(transfer-logex github.com/Badangel/logex)
+
+#add_custom_target(logex
+#                  COMMAND env GOPATH=${GOPATH} ${CMAKE_Go_COMPILER} get github.com/Badangel/logex
+#                  DEPENDS rfw)
 
 add_subdirectory(src)
-install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/conf DESTINATION ${PADDLE_SERVING_INSTALL_DIR})
+#install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/conf DESTINATION ${PADDLE_SERVING_INSTALL_DIR})
diff --git a/core/cube/cube-transfer/src/CMakeLists.txt b/core/cube/cube-transfer/src/CMakeLists.txt
index 62d3f7ef..13fee7fb 100644
--- a/core/cube/cube-transfer/src/CMakeLists.txt
+++ b/core/cube/cube-transfer/src/CMakeLists.txt
@@ -14,6 +14,7 @@
 
 set(SOURCE_FILE cube-transfer.go)
 add_go_executable(cube-transfer ${SOURCE_FILE})
-add_dependencies(cube-transfer docopt-go)
-add_dependencies(cube-transfer rfw)
-add_dependencies(cube-transfer logex)
+add_dependencies(cube-transfer paddle_python)
+add_dependencies(cube-transfer transfer-docopt-go)
+add_dependencies(cube-transfer transfer-rfw)
+add_dependencies(cube-transfer transfer-logex)
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index de1fe284..589420ad 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -81,7 +81,6 @@ if (SERVER)
   if(WITH_LITE)
     set(VERSION_SUFFIX 2)
   endif()
-
   add_custom_command(
     OUTPUT ${PADDLE_SERVING_BINARY_DIR}/.timestamp
     COMMAND cp -r
-- 
GitLab