From 81370e35de8c1e90d01d16fb7ec97bbf44610854 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: Wed, 30 Jan 2019 17:00:02 +0900 Subject: [PATCH] [caffegen] Do NOT require CaffeProto (#2964) * [caffegen] Do NOT require CaffeProto Caffe package includes CaffeProto, and thus it is unnecessary to request CaffeProto. Signed-off-by: Jonghyun Park * Fix a typo (an -> and) --- contrib/caffegen/CMakeLists.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/contrib/caffegen/CMakeLists.txt b/contrib/caffegen/CMakeLists.txt index 2875937..b4f3e59 100644 --- a/contrib/caffegen/CMakeLists.txt +++ b/contrib/caffegen/CMakeLists.txt @@ -1,9 +1,3 @@ -nncc_find_package(CaffeProto QUIET) - -if(NOT CaffeProto_FOUND) - return() -endif(NOT CaffeProto_FOUND) - nncc_find_package(Caffe QUIET) if(NOT Caffe_FOUND) @@ -15,5 +9,6 @@ file(GLOB_RECURSE SOURCES "src/*.cpp") 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) target_link_libraries(caffegen caffe) -- 2.7.4