|
@@ -73,7 +73,11 @@ endif()
|
|
|
if(EXISTS "${PADDLE_DIR}/third_party/install/snappystream/include")
|
|
if(EXISTS "${PADDLE_DIR}/third_party/install/snappystream/include")
|
|
|
include_directories("${PADDLE_DIR}/third_party/install/snappystream/include")
|
|
include_directories("${PADDLE_DIR}/third_party/install/snappystream/include")
|
|
|
endif()
|
|
endif()
|
|
|
-include_directories("${PADDLE_DIR}/third_party/install/zlib/include")
|
|
|
|
|
|
|
+# zlib does not exist in 1.8.1
|
|
|
|
|
+if (EXISTS "${PADDLE_DIR}/third_party/install/zlib/include")
|
|
|
|
|
+ include_directories("${PADDLE_DIR}/third_party/install/zlib/include")
|
|
|
|
|
+endif()
|
|
|
|
|
+
|
|
|
include_directories("${PADDLE_DIR}/third_party/boost")
|
|
include_directories("${PADDLE_DIR}/third_party/boost")
|
|
|
include_directories("${PADDLE_DIR}/third_party/eigen3")
|
|
include_directories("${PADDLE_DIR}/third_party/eigen3")
|
|
|
|
|
|
|
@@ -84,7 +88,10 @@ if(EXISTS "${PADDLE_DIR}/third_party/install/snappystream/lib")
|
|
|
link_directories("${PADDLE_DIR}/third_party/install/snappystream/lib")
|
|
link_directories("${PADDLE_DIR}/third_party/install/snappystream/lib")
|
|
|
endif()
|
|
endif()
|
|
|
|
|
|
|
|
-link_directories("${PADDLE_DIR}/third_party/install/zlib/lib")
|
|
|
|
|
|
|
+if (EXISTS "${PADDLE_DIR}/third_party/install/zlib/lib")
|
|
|
|
|
+ link_directories("${PADDLE_DIR}/third_party/install/zlib/lib")
|
|
|
|
|
+endif()
|
|
|
|
|
+
|
|
|
link_directories("${PADDLE_DIR}/third_party/install/protobuf/lib")
|
|
link_directories("${PADDLE_DIR}/third_party/install/protobuf/lib")
|
|
|
link_directories("${PADDLE_DIR}/third_party/install/glog/lib")
|
|
link_directories("${PADDLE_DIR}/third_party/install/glog/lib")
|
|
|
link_directories("${PADDLE_DIR}/third_party/install/gflags/lib")
|
|
link_directories("${PADDLE_DIR}/third_party/install/gflags/lib")
|
|
@@ -204,8 +211,11 @@ if (NOT WIN32)
|
|
|
else()
|
|
else()
|
|
|
set(DEPS ${DEPS}
|
|
set(DEPS ${DEPS}
|
|
|
${MATH_LIB} ${MKLDNN_LIB}
|
|
${MATH_LIB} ${MKLDNN_LIB}
|
|
|
- glog gflags_static libprotobuf zlibstatic xxhash libyaml-cppmt)
|
|
|
|
|
|
|
+ glog gflags_static libprotobuf xxhash libyaml-cppmt)
|
|
|
|
|
|
|
|
|
|
+ if (EXISTS "${PADDLE_DIR}/third_party/install/zlib/lib")
|
|
|
|
|
+ set(DEPS ${DEPS} zlibstatic)
|
|
|
|
|
+ endif()
|
|
|
set(DEPS ${DEPS} libcmt shlwapi)
|
|
set(DEPS ${DEPS} libcmt shlwapi)
|
|
|
if (EXISTS "${PADDLE_DIR}/third_party/install/snappy/lib")
|
|
if (EXISTS "${PADDLE_DIR}/third_party/install/snappy/lib")
|
|
|
set(DEPS ${DEPS} snappy)
|
|
set(DEPS ${DEPS} snappy)
|