From b825169241bd1d6abbe56eb60286d05dc1cfcd37 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EB=B0=95=EC=A2=85=ED=98=84/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Staff=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Fri, 31 Aug 2018 17:35:37 +0900 Subject: [PATCH] [CaffeProto] Do NOT generate files at top-level (#1273) CaffeProto package currently places generated protobuf files into the top-level binary directory. With this commit, generated protobufe files are inside a directory dedicated to caffeproto target (external/caffeproto). Signed-off-by: Jonghyun Park --- cmake/packages/CaffeProto/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/packages/CaffeProto/CMakeLists.txt b/cmake/packages/CaffeProto/CMakeLists.txt index fff028e..fd5623b 100644 --- a/cmake/packages/CaffeProto/CMakeLists.txt +++ b/cmake/packages/CaffeProto/CMakeLists.txt @@ -1,4 +1,4 @@ -Protobuf_Generate(CAFFE_PROTO "${CMAKE_BINARY_DIR}/generated/caffe" "${CaffeSource_DIR}/src" "caffe/proto/caffe.proto") +Protobuf_Generate(CAFFE_PROTO "${CMAKE_CURRENT_BINARY_DIR}/generated/caffe" "${CaffeSource_DIR}/src" "caffe/proto/caffe.proto") add_library(caffeproto SHARED ${CAFFE_PROTO_SOURCES}) target_include_directories(caffeproto PUBLIC ${CAFFE_PROTO_INCLUDE_DIRS}) -- 2.7.4