提交 a1cba1d8 编写于 作者: G gangliao 提交者: GitHub

Merge pull request #92 from reyoung/find_zlib

Add findZLIB in cmake
...@@ -14,7 +14,8 @@ find_package(CUDA QUIET) ...@@ -14,7 +14,8 @@ find_package(CUDA QUIET)
find_package(Protobuf REQUIRED) find_package(Protobuf REQUIRED)
find_package(PythonLibs 2.7 REQUIRED) find_package(PythonLibs 2.7 REQUIRED)
find_package(PythonInterp 2.7 REQUIRED) find_package(PythonInterp 2.7 REQUIRED)
find_package(NumPy) find_package(ZLIB REQUIRED)
find_package(NumPy REQUIRED)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
find_package(Glog) find_package(Glog)
find_package(Gflags QUIET) find_package(Gflags QUIET)
......
...@@ -67,9 +67,9 @@ function(link_paddle_exe TARGET_NAME) ...@@ -67,9 +67,9 @@ function(link_paddle_exe TARGET_NAME)
${PROTOBUF_LIBRARY} ${PROTOBUF_LIBRARY}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
${CBLAS_LIBS} ${CBLAS_LIBS}
${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES}
${INTERAL_LIBS} ${INTERAL_LIBS}
-lz) ${CMAKE_DL_LIBS})
if(WITH_PYTHON) if(WITH_PYTHON)
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册