fix: caffe build can use custom opencv

jolibrain · May 25, 2022 · fde90cd · fde90cd
1 parent 5c2c9f1
commit fde90cd
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -662,10 +662,13 @@ elseif(USE_CAFFE)
         echo "DEBUG:=${CAFFE_DEBUG}" >> Makefile.config &&
         echo "INCLUDE_DIRS+=${SPDLOG_INCLUDE_DIR}" >> Makefile.config &&
         echo "INCLUDE_DIRS+=${PROTOBUF_INCLUDE_DIR}" >> Makefile.config &&
+        echo "INCLUDE_DIRS+=${OpenCV_INCLUDE_DIRS}" >> Makefile.config &&
         echo "CUDA_ARCH:=${CUDA_ARCH}" >> Makefile.config &&
         echo "LIBRARIES+=${SPDLOG_CAFFE_LIB_DEPS}" >> Makefile.config &&
+        echo "LIBRARIES+=${OpenCV_LIBS}" >> Makefile.config &&
         echo "LIBRARY_DIRS+=${SPDLOG_LIB_DIR}" >> Makefile.config &&
-        echo "LIBRARY_DIRS+=${PROTOBUF_LIB_DIR}" >> Makefile.config
+        echo "LIBRARY_DIRS+=${PROTOBUF_LIB_DIR}" >> Makefile.config &&
+        echo "LIBRARY_DIRS+=${OpenCV_CONFIG_PATH}/lib" >> Makefile.config
     BUILD_COMMAND 
         ${CMAKE_COMMAND} -E env LD_LIBRARY_PATH=${PROTOBUF_LIB_DIR}:$ENV{LD_LIBRARY_PATH} PATH=${PROTOBUF_LIB_DIR}:$ENV{PATH} make -j${N} proto &&
         ${CMAKE_COMMAND} -E env LD_LIBRARY_PATH=${PROTOBUF_LIB_DIR}:$ENV{LD_LIBRARY_PATH} PATH=${PROTOBUF_LIB_DIR}:$ENV{PATH} make -j${N} all