提交 e9b51a99 编写于 作者: Y Ybjjwwang

fix cube cmake

上级 5699ab64
...@@ -11,10 +11,8 @@ ...@@ -11,10 +11,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License # limitations under the License
#execute_process(COMMAND go env -w GO111MODULE=off)
add_subdirectory(cube-server) add_subdirectory(cube-server)
add_subdirectory(cube-api) add_subdirectory(cube-api)
add_subdirectory(cube-builder) add_subdirectory(cube-builder)
#add_subdirectory(cube-transfer) add_subdirectory(cube-transfer)
#add_subdirectory(cube-agent) add_subdirectory(cube-agent)
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
project(cube-agent Go) project(cube-agent Go)
include(cmake/golang.cmake) include(cmake/golang.cmake)
ExternalGoProject_Add(agent-docopt-go github.com/docopt/docopt-go) ExternalGoProject_Add(agent-docopt-go github.com/docopt/docopt-go)
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
set(SOURCE_FILE cube-agent.go) set(SOURCE_FILE cube-agent.go)
add_go_executable(cube-agent ${SOURCE_FILE}) 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-docopt-go)
add_dependencies(cube-agent agent-logex) add_dependencies(cube-agent agent-logex)
add_dependencies(cube-agent agent-pipeline) add_dependencies(cube-agent agent-pipeline)
...@@ -18,11 +18,13 @@ project(cube-transfer Go) ...@@ -18,11 +18,13 @@ project(cube-transfer Go)
include(cmake/golang.cmake) include(cmake/golang.cmake)
ExternalGoProject_Add(rfw github.com/mipearson/rfw) ExternalGoProject_Add(transfer-rfw github.com/mipearson/rfw)
ExternalGoProject_Add(docopt-go github.com/docopt/docopt-go) ExternalGoProject_Add(transfer-docopt-go github.com/docopt/docopt-go)
add_custom_target(logex ExternalGoProject_Add(transfer-logex github.com/Badangel/logex)
COMMAND env GOPATH=${GOPATH} ${CMAKE_Go_COMPILER} get github.com/Badangel/logex
DEPENDS rfw) #add_custom_target(logex
# COMMAND env GOPATH=${GOPATH} ${CMAKE_Go_COMPILER} get github.com/Badangel/logex
# DEPENDS rfw)
add_subdirectory(src) 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})
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
set(SOURCE_FILE cube-transfer.go) set(SOURCE_FILE cube-transfer.go)
add_go_executable(cube-transfer ${SOURCE_FILE}) add_go_executable(cube-transfer ${SOURCE_FILE})
add_dependencies(cube-transfer docopt-go) add_dependencies(cube-transfer paddle_python)
add_dependencies(cube-transfer rfw) add_dependencies(cube-transfer transfer-docopt-go)
add_dependencies(cube-transfer logex) add_dependencies(cube-transfer transfer-rfw)
add_dependencies(cube-transfer transfer-logex)
...@@ -81,7 +81,6 @@ if (SERVER) ...@@ -81,7 +81,6 @@ if (SERVER)
if(WITH_LITE) if(WITH_LITE)
set(VERSION_SUFFIX 2) set(VERSION_SUFFIX 2)
endif() endif()
add_custom_command( add_custom_command(
OUTPUT ${PADDLE_SERVING_BINARY_DIR}/.timestamp OUTPUT ${PADDLE_SERVING_BINARY_DIR}/.timestamp
COMMAND cp -r COMMAND cp -r
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册