From a0690c691ec1337b28d1ae64a597217b3b8b068b Mon Sep 17 00:00:00 2001 From: sjtubinlong Date: Sat, 12 Oct 2019 15:48:48 +0800 Subject: [PATCH] update inference/CMakeLists.txt --- inference/CMakeLists.txt | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/inference/CMakeLists.txt b/inference/CMakeLists.txt index 86b378b2..8c3808da 100644 --- a/inference/CMakeLists.txt +++ b/inference/CMakeLists.txt @@ -42,14 +42,23 @@ include_directories("${PADDLE_DIR}/third_party/install/protobuf/include") include_directories("${PADDLE_DIR}/third_party/install/glog/include") include_directories("${PADDLE_DIR}/third_party/install/gflags/include") include_directories("${PADDLE_DIR}/third_party/install/xxhash/include") -include_directories("${PADDLE_DIR}/third_party/install/snappy/include") -include_directories("${PADDLE_DIR}/third_party/install/snappystream/include") +if (EXISTS "${PADDLE_DIR}/third_party/install/snappy/include") + include_directories("${PADDLE_DIR}/third_party/install/snappy/include") +endif() +if(EXISTS "${PADDLE_DIR}/third_party/install/snappystream/include") + include_directories("${PADDLE_DIR}/third_party/install/snappystream/include") +endif() include_directories("${PADDLE_DIR}/third_party/install/zlib/include") include_directories("${PADDLE_DIR}/third_party/boost") include_directories("${PADDLE_DIR}/third_party/eigen3") -link_directories("${PADDLE_DIR}/third_party/install/snappy/lib") -link_directories("${PADDLE_DIR}/third_party/install/snappystream/lib") +if (EXISTS "${PADDLE_DIR}/third_party/install/snappy/lib") + link_directories("${PADDLE_DIR}/third_party/install/snappy/lib") +endif() +if(EXISTS "${PADDLE_DIR}/third_party/install/snappystream/lib") + link_directories("${PADDLE_DIR}/third_party/install/snappystream/lib") +endif() + link_directories("${PADDLE_DIR}/third_party/install/zlib/lib") link_directories("${PADDLE_DIR}/third_party/install/protobuf/lib") link_directories("${PADDLE_DIR}/third_party/install/glog/lib") @@ -160,13 +169,25 @@ if (NOT WIN32) set(EXTERNAL_LIB "-lrt -ldl -lpthread") set(DEPS ${DEPS} ${MATH_LIB} ${MKLDNN_LIB} - glog gflags protobuf yaml-cpp snappystream snappy z xxhash + glog gflags protobuf yaml-cpp z xxhash ${EXTERNAL_LIB}) + if(EXISTS "${PADDLE_DIR}/third_party/install/snappystream/lib") + set(DEPS ${DEPS} snappystream) + endif() + if (EXISTS "${PADDLE_DIR}/third_party/install/snappy/lib") + set(DEPS ${DEPS} snappy) + endif() else() set(DEPS ${DEPS} ${MATH_LIB} ${MKLDNN_LIB} - opencv_world346 glog libyaml-cppmt gflags_static libprotobuf snappy zlibstatic xxhash snappystream ${EXTERNAL_LIB}) + opencv_world346 glog libyaml-cppmt gflags_static libprotobuf zlibstatic xxhash ${EXTERNAL_LIB}) set(DEPS ${DEPS} libcmt shlwapi) + if (EXISTS "${PADDLE_DIR}/third_party/install/snappy/lib") + set(DEPS ${DEPS} snappy) + endif() + if(EXISTS "${PADDLE_DIR}/third_party/install/snappystream/lib") + set(DEPS ${DEPS} snappystream) + endif() endif(NOT WIN32) if(WITH_GPU) -- GitLab