Merge branch 'develop' into network

cmake/generic.cmake

@@ -162,6 +162,7 @@ function(cc_library TARGET_NAME)
     endif()
     if (cc_library_DEPS)
       add_dependencies(${TARGET_NAME} ${cc_library_DEPS})
+      target_link_libraries(${TARGET_NAME} ${cc_library_DEPS})
     endif()
   else(cc_library_SRCS)
     if (cc_library_DEPS)
@@ -211,6 +212,7 @@ function(nv_library TARGET_NAME)
       endif()
       if (nv_library_DEPS)
         add_dependencies(${TARGET_NAME} ${nv_library_DEPS})
+        target_link_libraries(${TARGET_NAME} ${nv_library_DEPS})
       endif()
     else(nv_library_SRCS)
       if (nv_library_DEPS)

paddle/framework/CMakeLists.txt

@@ -7,7 +7,8 @@ cc_test(scope_test SRCS scope_test.cc)
 cc_test(enforce_test SRCS enforce_test.cc)
 proto_library(attr_type SRCS attr_type.proto)
 proto_library(op_proto SRCS op_proto.proto DEPS attr_type)
+
 cc_test(op_proto_test SRCS op_proto_test.cc DEPS op_proto attr_type protobuf)
 
 proto_library(net_proto SRCS net_proto.proto)
-cc_library(net SRCS net.cc DEPS net_proto attr_type op_proto)
+cc_library(net SRCS net.cc DEPS net_proto attr_type op_proto)
\ No newline at end of file