Skip to content

Commit 5a2f82e

Browse files
native-apiskvark
authored andcommitted
Including a custom libjpeg is no longer needed (opencv#231)
* Including a custom libjpeg is no longer needed Since opencv/opencv#11497, OpenCV bundles its own * (dummy commit to trigger rebuild)
1 parent eed0f0d commit 5a2f82e

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

setup.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,6 @@ def main():
133133
cmake_args.append("-DWITH_V4L=ON")
134134
cmake_args.append("-DENABLE_PRECOMPILED_HEADERS=OFF")
135135

136-
if all(v in os.environ for v in ('JPEG_INCLUDE_DIR', 'JPEG_LIBRARY')):
137-
cmake_args += [
138-
"-DBUILD_JPEG=OFF",
139-
"-DJPEG_INCLUDE_DIR=%s" % os.environ['JPEG_INCLUDE_DIR'],
140-
"-DJPEG_LIBRARY=%s" % os.environ['JPEG_LIBRARY']
141-
]
142-
143136
# Fixes for macOS builds
144137
if sys.platform == 'darwin':
145138
cmake_args.append("-DWITH_LAPACK=OFF") # Some OSX LAPACK fns are incompatible, see

0 commit comments

Comments
 (0)