Browse Source

add zlib for opencv

ruki 5 years ago
parent
commit
73f16362e8
1 changed files with 2 additions and 5 deletions
  1. 2 5
      packages/o/opencv/xmake.lua

+ 2 - 5
packages/o/opencv/xmake.lua

@@ -14,6 +14,7 @@ package("opencv")
     if is_plat("macosx") then
     if is_plat("macosx") then
         add_frameworks("Foundation", "CoreFoundation", "CoreGraphics", "AppKit", "OpenCL")
         add_frameworks("Foundation", "CoreFoundation", "CoreGraphics", "AppKit", "OpenCL")
     elseif is_plat("linux") then
     elseif is_plat("linux") then
+        add_deps("zlib")
         add_syslinks("pthread", "dl")
         add_syslinks("pthread", "dl")
     end
     end
 
 
@@ -69,6 +70,7 @@ package("opencv")
                          "-DBUILD_PNG=OFF",
                          "-DBUILD_PNG=OFF",
                          "-DBUILD_TESTS=OFF",
                          "-DBUILD_TESTS=OFF",
                          "-DBUILD_TIFF=OFF",
                          "-DBUILD_TIFF=OFF",
+                         "-DBUILD_ZLIB=OFF",
                          "-DBUILD_opencv_hdf=OFF",
                          "-DBUILD_opencv_hdf=OFF",
                          "-DBUILD_opencv_java=OFF",
                          "-DBUILD_opencv_java=OFF",
                          "-DBUILD_opencv_text=ON",
                          "-DBUILD_opencv_text=ON",
@@ -91,11 +93,6 @@ package("opencv")
                          "-DWITH_LAPACK=OFF",
                          "-DWITH_LAPACK=OFF",
                          "-DBUILD_opencv_python2=OFF",
                          "-DBUILD_opencv_python2=OFF",
                          "-DBUILD_opencv_python3=ON"}
                          "-DBUILD_opencv_python3=ON"}
-        if is_plat("linux") then
-            table.insert(configs, "-DBUILD_ZLIB=ON")
-        else
-            table.insert(configs, "-DBUILD_ZLIB=OFF")
-        end
         table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
         table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
         -- TODO it will be removed after xmake v2.3.0
         -- TODO it will be removed after xmake v2.3.0
         local modulesdir = package:data("install_modules")()
         local modulesdir = package:data("install_modules")()