Find GLog via internal script (#219)

This commit revises Caffe external module to lookup GLof 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 56fec65..01b5352 100644 (file)
--- a/cmake/packages/CaffeConfig.cmake
+++ b/cmake/packages/CaffeConfig.cmake
@@ -36,9 +36,9 @@ function(_Caffe_import)
     return()
   endif()
 
-  find_package(Glog)
+  nncc_find_package(GLog QUIET)
 
-  if(NOT GLOG_FOUND)
+  if(NOT GLog_FOUND)
     set(Caffe_FOUND FALSE PARENT_SCOPE)
     return()
   endif()
@@ -58,11 +58,10 @@ function(_Caffe_import)
     target_compile_definitions(caffe PUBLIC CPU_ONLY)
     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 ${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 glog)
     target_link_libraries(caffe gflags)
     target_link_libraries(caffe ${Boost_LIBRARIES})
     target_link_libraries(caffe ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES})