Merge pull request #92 from reyoung/find_zlib

Add findZLIB in cmake
9 years ago · a1cba1d845
parent e68c3ad5dd 494f5a836b
commit a1cba1d845
2 changed files with 4 additions and 3 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -14,7 +14,8 @@ find_package(CUDA QUIET)
 find_package(Protobuf REQUIRED)
 find_package(PythonLibs 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(Glog)
 find_package(Gflags QUIET)
--- a/cmake/util.cmake
+++ b/cmake/util.cmake
@ -67,9 +67,9 @@ function(link_paddle_exe TARGET_NAME)
        ${PROTOBUF_LIBRARY}
        ${CMAKE_THREAD_LIBS_INIT}
        ${CBLAS_LIBS}
-        ${CMAKE_DL_LIBS}
+        ${ZLIB_LIBRARIES}
        ${INTERAL_LIBS}
-        -lz)
+        ${CMAKE_DL_LIBS})
    
    if(WITH_PYTHON)
        target_link_libraries(${TARGET_NAME}