Skip to content

Commit fde90cd

Browse files
Bycobmergify[bot]
authored andcommitted
fix: caffe build can use custom opencv
1 parent 5c2c9f1 commit fde90cd

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -662,10 +662,13 @@ elseif(USE_CAFFE)
662662
echo "DEBUG:=${CAFFE_DEBUG}" >> Makefile.config &&
663663
echo "INCLUDE_DIRS+=${SPDLOG_INCLUDE_DIR}" >> Makefile.config &&
664664
echo "INCLUDE_DIRS+=${PROTOBUF_INCLUDE_DIR}" >> Makefile.config &&
665+
echo "INCLUDE_DIRS+=${OpenCV_INCLUDE_DIRS}" >> Makefile.config &&
665666
echo "CUDA_ARCH:=${CUDA_ARCH}" >> Makefile.config &&
666667
echo "LIBRARIES+=${SPDLOG_CAFFE_LIB_DEPS}" >> Makefile.config &&
668+
echo "LIBRARIES+=${OpenCV_LIBS}" >> Makefile.config &&
667669
echo "LIBRARY_DIRS+=${SPDLOG_LIB_DIR}" >> Makefile.config &&
668-
echo "LIBRARY_DIRS+=${PROTOBUF_LIB_DIR}" >> Makefile.config
670+
echo "LIBRARY_DIRS+=${PROTOBUF_LIB_DIR}" >> Makefile.config &&
671+
echo "LIBRARY_DIRS+=${OpenCV_CONFIG_PATH}/lib" >> Makefile.config
669672
BUILD_COMMAND
670673
${CMAKE_COMMAND} -E env LD_LIBRARY_PATH=${PROTOBUF_LIB_DIR}:$ENV{LD_LIBRARY_PATH} PATH=${PROTOBUF_LIB_DIR}:$ENV{PATH} make -j${N} proto &&
671674
${CMAKE_COMMAND} -E env LD_LIBRARY_PATH=${PROTOBUF_LIB_DIR}:$ENV{LD_LIBRARY_PATH} PATH=${PROTOBUF_LIB_DIR}:$ENV{PATH} make -j${N} all

0 commit comments

Comments
 (0)