From: 박종현/동작제어Lab(SR)/Senior Engineer/삼성전자 <jh1302.park@samsung.com>
Date: Fri, 11 May 2018 05:48:02 +0000 (+0900)
Subject: Find GFlags via internal script when building Caffe (#218)
X-Git-Tag: nncc_backup~2697
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ff8afee3b39614686416a789d0e1444dfeb89739;p=platform%2Fcore%2Fml%2Fnnfw.git

Find GFlags via internal script when building Caffe (#218)

This commit revises Caffe external module to lookup GFlags using
nncc_find_package instead of find_package.

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>
---

diff --git a/cmake/packages/CaffeConfig.cmake b/cmake/packages/CaffeConfig.cmake
index 026720e..56fec65 100644
--- a/cmake/packages/CaffeConfig.cmake
+++ b/cmake/packages/CaffeConfig.cmake
@@ -43,9 +43,9 @@ function(_Caffe_import)
     return()
   endif()
 
-  find_package(GFlags)
+  nncc_find_package(GFlags QUIET)
 
-  if(NOT GFLAGS_FOUND)
+  if(NOT GFlags_FOUND)
     set(Caffe_FOUND FALSE PARENT_SCOPE)
     return()
   endif()
@@ -59,12 +59,11 @@ function(_Caffe_import)
     target_include_directories(caffe PUBLIC ${CaffeSource_DIR}/include)
     target_include_directories(caffe PRIVATE ${Boost_INCLUDE_DIRS})
     target_include_directories(caffe PRIVATE ${GLOG_INCLUDE_DIRS})
-    target_include_directories(caffe PRIVATE ${GFLAGS_INCLUDE_DIRS})
     target_include_directories(caffe PRIVATE ${HDF5_INCLUDE_DIRS})
     target_include_directories(caffe PRIVATE ${Atlas_INCLUDE_DIRS})
     target_link_libraries(caffe caffeproto)
     target_link_libraries(caffe ${GLOG_LIBRARIES})
-    target_link_libraries(caffe ${GFLAGS_LIBRARIES})
+    target_link_libraries(caffe gflags)
     target_link_libraries(caffe ${Boost_LIBRARIES})
     target_link_libraries(caffe ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES})
     target_link_libraries(caffe ${Atlas_LIBRARIES})