提交 938663dc 编写于 作者: B barrierye

cmake fix #436

上级 dbe458b1
...@@ -18,9 +18,9 @@ project(cube-transfer Go) ...@@ -18,9 +18,9 @@ project(cube-transfer Go)
include(cmake/golang.cmake) include(cmake/golang.cmake)
ExternalGoProject_Add(docopt-go github.com/docopt/docopt-go)
ExternalGoProject_Add(rfw github.com/mipearson/rfw) ExternalGoProject_Add(rfw github.com/mipearson/rfw)
ExternalGoProject_Add(logex github.com/Badangel/logex) ExternalGoProject_Add_With_Deps(docopt-go github.com/docopt/docopt-go github.com/mipearson/rfw)
ExternalGoProject_Add_With_Deps(logex github.com/Badangel/logex github.com/mipearson/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})
...@@ -19,6 +19,12 @@ function(ExternalGoProject_Add TARG) ...@@ -19,6 +19,12 @@ function(ExternalGoProject_Add TARG)
add_custom_target(${TARG} env GOPATH=${GOPATH} ${CMAKE_Go_COMPILER} get ${ARGN}) add_custom_target(${TARG} env GOPATH=${GOPATH} ${CMAKE_Go_COMPILER} get ${ARGN})
endfunction(ExternalGoProject_Add) endfunction(ExternalGoProject_Add)
function(ExternalGoProject_Add_With_Deps TARG DEPS)
add_custom_target(${TARG}
COMMAND env GOPATH=${GOPATH} ${CMAKE_Go_COMPILER} get ${ARGN}
DEPENDS ${DEPS})
endfunction(ExternalGoProject_Add_With_Deps)
function(add_go_executable NAME) function(add_go_executable NAME)
file(GLOB GO_SOURCE RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.go") file(GLOB GO_SOURCE RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.go")
add_custom_command(OUTPUT ${OUTPUT_DIR}/.timestamp add_custom_command(OUTPUT ${OUTPUT_DIR}/.timestamp
...@@ -57,4 +63,4 @@ function(ADD_GO_LIBRARY NAME BUILD_TYPE) ...@@ -57,4 +63,4 @@ function(ADD_GO_LIBRARY NAME BUILD_TYPE)
if(NOT BUILD_TYPE STREQUAL "STATIC") if(NOT BUILD_TYPE STREQUAL "STATIC")
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME} DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/bin) install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME} DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/bin)
endif() endif()
endfunction(ADD_GO_LIBRARY) endfunction(ADD_GO_LIBRARY)
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册