wip: windows path test

homuler · Jan 5, 2025 · ee6942d · ee6942d
1 parent b847be8
commit ee6942d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/docker/windows/x86_64/Dockerfile b/docker/windows/x86_64/Dockerfile
@@ -153,6 +153,7 @@ COPY third_party third_party
 
 # cache bazel
 COPY docker/windows/x86_64/cache_bazel.bat cache_bazel.bat
+RUN dir /s C:\opencv
 RUN cache_bazel.bat && del cache_bazel.bat
 
 CMD ["cmd"]
diff --git a/third_party/opencv.BUILD b/third_party/opencv.BUILD
@@ -214,12 +214,12 @@ cmake(
     }),
     out_lib_dir = ".",
     out_static_libs = select({
-        ":dbg_cmake_static_win": ["staticlib/opencv_world4100d.lib"],
-        ":cmake_static_win": ["staticlib/opencv_world4100.lib"],
+        ":dbg_cmake_static_win": ["lib/opencv_world4100d.lib"],
+        ":cmake_static_win": ["lib/opencv_world4100.lib"],
         "//conditions:default": ["lib/libopencv_world.a"],
     }) + select({
-        ":dbg_cmake_static_win": ["staticlib/%sd.lib" % lib for lib in OPENCV_3RDPARTY_LIBS],
-        ":cmake_static_win": ["staticlib/%s.lib" % lib for lib in OPENCV_3RDPARTY_LIBS],
+        ":dbg_cmake_static_win": ["lib/%sd.lib" % lib for lib in OPENCV_3RDPARTY_LIBS],
+        ":cmake_static_win": ["lib/%s.lib" % lib for lib in OPENCV_3RDPARTY_LIBS],
         "@cpuinfo//:macos_arm64": ["lib/opencv4/3rdparty/lib%s.a" % lib for lib in OPENCV_3RDPARTY_LIBS_M1],
         "//conditions:default": ["lib/opencv4/3rdparty/lib%s.a" % lib for lib in OPENCV_3RDPARTY_LIBS],
     }),

diff --git a/third_party/opencv_windows.BUILD b/third_party/opencv_windows.BUILD
@@ -27,8 +27,8 @@ OPENCV_VERSION = "4100"  # 4.10.0
 cc_library(
     name = "opencv",
     srcs = [
-        "x64/vc15/lib/opencv_world" + OPENCV_VERSION + ".lib",
-        "x64/vc15/bin/opencv_world" + OPENCV_VERSION + ".dll",
+        "x64/vc16/lib/opencv_world" + OPENCV_VERSION + ".lib",
+        "x64/vc16/bin/opencv_world" + OPENCV_VERSION + ".dll",
     ],
     hdrs = glob(["include/opencv4/opencv2/**/*.h*"]),
     includes = ["include/"],
@@ -39,7 +39,7 @@ cc_library(
 filegroup(
     name = "opencv_world_dll",
     srcs = [
-        "x64/vc15/bin/opencv_world" + OPENCV_VERSION + ".dll",
+        "x64/vc16/bin/opencv_world" + OPENCV_VERSION + ".dll",
     ],
     visibility = ["//visibility:public"],
 )