bert/research-project
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Properly search for OpenCV.

Browse Source
This commit is contained in:
Bert Peters
2018-04-05 17:35:46 +02:00
parent 375833bc87
commit 2bc3d5ae95
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/modules/FindCaffe.cmake
View File

@@ -23,7 +23,6 @@ find_library(Caffe_LIBRARY
PATHS ${Caffe_DIR}
DOC "The Caffe library")
find_package(OpenCV REQUIRED)
find_package(Glog REQUIRED)
find_package(Boost 1.55 REQUIRED COMPONENTS system)
@@ -48,9 +47,9 @@ if (CAFFE_FOUND)
add_library(Caffe::Caffe UNKNOWN IMPORTED)
set_target_properties(Caffe::Caffe PROPERTIES
INTERFACE_COMPILE_DEFINITIONS "${Caffe_DEFINITIONS}"
INTERFACE_INCLUDE_DIRECTORIES "${Caffe_INCLUDE_DIR};${OpenCV_INCLUDE_DIRS}"
INTERFACE_INCLUDE_DIRECTORIES "${Caffe_INCLUDE_DIR}"
IMPORTED_LOCATION "${Caffe_LIBRARY}"
INTERFACE_LINK_LIBRARIES "Glog::Glog;Boost::system;${OpenCV_LIBRARIES};${Caffe_ADDITIONAL_LIBS}"
INTERFACE_LINK_LIBRARIES "Glog::Glog;Boost::system;${Caffe_ADDITIONAL_LIBS}"
)
set(Caffe_LIBRARIES ${Caffe_LIBRARY})