From 1fc35a170326a474b3ec0f7562589ad6f6372433 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EB=B0=95=EC=A2=85=ED=98=84/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Senior=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Tue, 15 May 2018 13:05:02 +0900 Subject: [PATCH] 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 --- cmake/packages/CaffeConfig.cmake | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cmake/packages/CaffeConfig.cmake b/cmake/packages/CaffeConfig.cmake index 56fec65..01b5352 100644 --- 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}) -- 2.7.4