提交 2a9edf02 编写于 作者: W wangguibao

Fix build error

Change-Id: I6b4116ae4cf70a45ae346cb47f1862f093290fb0
上级 f3c782b8
...@@ -58,7 +58,8 @@ ExternalProject_Add( ...@@ -58,7 +58,8 @@ ExternalProject_Add(
-DCMAKE_INSTALL_LIBDIR:PATH=${PADDLE_INSTALL_DIR}/lib -DCMAKE_INSTALL_LIBDIR:PATH=${PADDLE_INSTALL_DIR}/lib
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
-DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE} -DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}
INSTALL_COMMAND "" BUILD_COMMAND make -j
INSTALL_COMMAND make fluid_lib_dist
) )
ExternalProject_Get_Property(extern_paddle BINARY_DIR) ExternalProject_Get_Property(extern_paddle BINARY_DIR)
......
...@@ -10,6 +10,7 @@ list(APPEND configure_srcs ${configure_proto_srcs}) ...@@ -10,6 +10,7 @@ list(APPEND configure_srcs ${configure_proto_srcs})
list(APPEND configure_srcs ${CMAKE_CURRENT_LIST_DIR}/src/configure_parser.cpp) list(APPEND configure_srcs ${CMAKE_CURRENT_LIST_DIR}/src/configure_parser.cpp)
add_library(configure ${configure_srcs}) add_library(configure ${configure_srcs})
add_dependencies(configure brpc)
add_executable(test_configure add_executable(test_configure
${CMAKE_CURRENT_LIST_DIR}/tests/test_configure.cpp) ${CMAKE_CURRENT_LIST_DIR}/tests/test_configure.cpp)
......
...@@ -4,8 +4,8 @@ target_include_directories(fluid_cpu_engine PUBLIC ...@@ -4,8 +4,8 @@ target_include_directories(fluid_cpu_engine PUBLIC
${CMAKE_CURRENT_LIST_DIR}/include ${CMAKE_CURRENT_LIST_DIR}/include
${PADDLE_INCLUDE_DIR} ${PADDLE_INCLUDE_DIR}
${CMAKE_BINARY_DIR}/Paddle/fluid_install_dir/) ${CMAKE_BINARY_DIR}/Paddle/fluid_install_dir/)
add_dependencies(fluid_cpu_engine pdserving paddle_fluid configure) add_dependencies(fluid_cpu_engine pdserving extern_paddle configure)
target_link_libraries(fluid_cpu_engine pdserving -liomp5 -lmklml_intel -lpthread -lcrypto -lm -lrt -lssl -ldl -lz) target_link_libraries(fluid_cpu_engine pdserving paddle_fluid -liomp5 -lmklml_intel -lpthread -lcrypto -lm -lrt -lssl -ldl -lz)
install(TARGETS fluid_cpu_engine install(TARGETS fluid_cpu_engine
ARCHIVE DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/lib ARCHIVE DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/lib
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define BAIDU_PADDLE_SERVING_PREDICTOR_OP_WRITE_JSON_OP_H #define BAIDU_PADDLE_SERVING_PREDICTOR_OP_WRITE_JSON_OP_H
#include "builtin_format.pb.h" #include "builtin_format.pb.h"
#include "image_classification.pb.h" #include "image_class.pb.h"
#include "common/inner_common.h" #include "common/inner_common.h"
#include "op/op.h" #include "op/op.h"
#include "framework/channel.h" #include "framework/channel.h"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册