From f6b67d7034eff76d9f6fa834202396d97f968c28 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EB=B0=95=EC=A2=85=ED=98=84/On-Device=20Lab=28SR=29/Staff?= =?utf8?q?=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Tue, 12 Feb 2019 08:55:18 +0900 Subject: [PATCH] [caffegen] Resolve ODR violation (#3022) To resolve ODR violation, this commit updates caffegen not to have caffeproto as its direct dependency. Signed-off-by: Jonghyun Park --- contrib/caffegen/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/caffegen/CMakeLists.txt b/contrib/caffegen/CMakeLists.txt index b4f3e59..5ffc43e 100644 --- a/contrib/caffegen/CMakeLists.txt +++ b/contrib/caffegen/CMakeLists.txt @@ -10,5 +10,5 @@ add_executable(caffegen ${SOURCES}) target_link_libraries(caffegen stdex) target_link_libraries(caffegen cli) # NOTE "Caffe" package provides both caffe and caffeproto target -target_link_libraries(caffegen caffeproto) +# NOTE "caffeproto" is linked to "caffe" target_link_libraries(caffegen caffe) -- 2.7.4