[caffegen] Do NOT require CaffeProto (#2964)
author박종현/On-Device Lab(SR)/Staff Engineer/삼성전자 <jh1302.park@samsung.com>
Wed, 30 Jan 2019 08:00:02 +0000 (17:00 +0900)
committerGitHub Enterprise <noreply-CODE@samsung.com>
Wed, 30 Jan 2019 08:00:02 +0000 (17:00 +0900)
* [caffegen] Do NOT require CaffeProto

Caffe package includes CaffeProto, and thus it is unnecessary to request
CaffeProto.

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>
* Fix a typo (an -> and)

contrib/caffegen/CMakeLists.txt

index 2875937..b4f3e59 100644 (file)
@@ -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)