diff --git a/WORKSPACE b/WORKSPACE index 5341b094a..dbec861dc 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -323,7 +323,7 @@ http_archive( new_local_repository( name = "linux_opencv", build_file = "@//third_party:opencv_linux.BUILD", - path = "/usr", + path = "/usr/local", ) new_local_repository( diff --git a/setup_opencv.sh b/setup_opencv.sh index b055b3a87..7e81ba7ea 100644 --- a/setup_opencv.sh +++ b/setup_opencv.sh @@ -40,7 +40,7 @@ if [ -z "$1" ] echo "Installing OpenCV from source" if [[ -x "$(command -v apt)" ]]; then sudo apt update && sudo apt install build-essential git - sudo apt install cmake ffmpeg libavformat-dev libdc1394-22-dev libgtk2.0-dev \ + sudo apt install cmake ffmpeg libavformat-dev libdc1394-dev libgtk2.0-dev \ libjpeg-dev libpng-dev libswscale-dev libtbb2 libtbb-dev \ libtiff-dev elif [[ -x "$(command -v dnf)" ]]; then diff --git a/third_party/opencv_linux.BUILD b/third_party/opencv_linux.BUILD index 844585541..c9d6184f3 100644 --- a/third_party/opencv_linux.BUILD +++ b/third_party/opencv_linux.BUILD @@ -13,29 +13,39 @@ exports_files(["LICENSE"]) # If you install OpenCV separately, please modify the build rule accordingly. cc_library( name = "opencv", - hdrs = glob([ + srcs = glob( + [ + "lib/libopencv_core.so", + "lib/libopencv_highgui.so", + "lib/libopencv_imgcodecs.so", + "lib/libopencv_imgproc.so", + "lib/libopencv_video.so", + "lib/libopencv_videoio.so", + ], + ), + hdrs = glob(["include/opencv4/**/*.h*"]), # For OpenCV 4.x #"include/aarch64-linux-gnu/opencv4/opencv2/cvconfig.h", #"include/arm-linux-gnueabihf/opencv4/opencv2/cvconfig.h", #"include/x86_64-linux-gnu/opencv4/opencv2/cvconfig.h", #"include/opencv4/opencv2/**/*.h*", - ]), - includes = [ + includes = ["include/opencv4/", # For OpenCV 4.x #"include/aarch64-linux-gnu/opencv4/", #"include/arm-linux-gnueabihf/opencv4/", #"include/x86_64-linux-gnu/opencv4/", #"include/opencv4/", ], + linkstatic = 1, linkopts = [ - "-l:libopencv_core.so", - "-l:libopencv_calib3d.so", - "-l:libopencv_features2d.so", - "-l:libopencv_highgui.so", - "-l:libopencv_imgcodecs.so", - "-l:libopencv_imgproc.so", - "-l:libopencv_video.so", - "-l:libopencv_videoio.so", + #"-l:libopencv_core.so", + #"-l:libopencv_calib3d.so", + #"-l:libopencv_features2d.so", + #"-l:libopencv_highgui.so", + #"-l:libopencv_imgcodecs.so", + #"-l:libopencv_imgproc.so", + #"-l:libopencv_video.so", + #"-l:libopencv_videoio.so", ], visibility = ["//visibility:public"], )