diff options
| author | Yangqing Jia <jiayq84@gmail.com> | 2017-01-04 17:26:43 -0800 |
|---|---|---|
| committer | Yangqing Jia <jiayq84@gmail.com> | 2017-01-04 17:27:18 -0800 |
| commit | a9e2693fa87382b7fa5516511ee3543a60967d2c (patch) | |
| tree | 6d0c6fb540b29ffdebecd75b930bb00356e9b090 /caffe | |
| parent | 9d42eca92ed3ad4da1b2034de079d023292707c6 (diff) | |
| download | pytorch-a9e2693fa87382b7fa5516511ee3543a60967d2c.tar.gz pytorch-a9e2693fa87382b7fa5516511ee3543a60967d2c.tar.bz2 pytorch-a9e2693fa87382b7fa5516511ee3543a60967d2c.zip | |
add back third_party/protobuf, but it won't be used in normal builds.
Pinned protobuf to v3.1.0
Removed the USE_SYSTEM_PROTOBUF option in cmake. It is no longer used.
Diffstat (limited to 'caffe')
| -rw-r--r-- | caffe/proto/CMakeLists.txt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/caffe/proto/CMakeLists.txt b/caffe/proto/CMakeLists.txt index 11ae84f30a..a3e36b007f 100644 --- a/caffe/proto/CMakeLists.txt +++ b/caffe/proto/CMakeLists.txt @@ -8,8 +8,4 @@ add_library(Caffe_PROTO SHARED ${Caffe_PROTO_HEADERS} ${Caffe_PROTO_SRCS}) target_include_directories(Caffe_PROTO PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) install(TARGETS Caffe_PROTO DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) -if(USE_SYSTEM_PROTOBUF) - target_link_libraries(Caffe_PROTO protobuf) -else() - add_dependencies(Caffe_PROTO protobuf_external) -endif() +target_link_libraries(Caffe_PROTO protobuf) |