Skip to content

Commit

Permalink
Including a custom libjpeg is no longer needed (#231)
Browse files Browse the repository at this point in the history
* Including a custom libjpeg is no longer needed

Since opencv/opencv#11497, OpenCV bundles its own

* (dummy commit to trigger rebuild)
  • Loading branch information
native-api authored and skvark committed Aug 18, 2019
1 parent eed0f0d commit 5a2f82e
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,6 @@ def main():
cmake_args.append("-DWITH_V4L=ON")
cmake_args.append("-DENABLE_PRECOMPILED_HEADERS=OFF")

if all(v in os.environ for v in ('JPEG_INCLUDE_DIR', 'JPEG_LIBRARY')):
cmake_args += [
"-DBUILD_JPEG=OFF",
"-DJPEG_INCLUDE_DIR=%s" % os.environ['JPEG_INCLUDE_DIR'],
"-DJPEG_LIBRARY=%s" % os.environ['JPEG_LIBRARY']
]

# Fixes for macOS builds
if sys.platform == 'darwin':
cmake_args.append("-DWITH_LAPACK=OFF") # Some OSX LAPACK fns are incompatible, see
Expand Down

0 comments on commit 5a2f82e

Please sign in to comment.