| diff -rupN orig/CMakeLists.txt patched/CMakeLists.txt |
| --- orig/CMakeLists.txt 2017-09-21 04:39:28.000000000 +0200 |
| +++ patched/CMakeLists.txt 2019-09-11 13:59:58.000000000 +0200 |
| @@ -22,24 +22,6 @@ set(libuvc_URL "https://github.com/ktoss |
| find_package(PkgConfig) |
| pkg_check_modules(LIBUSB libusb-1.0) |
| |
| -# Try to find JPEG using a module or pkg-config. If that doesn't work, search for the header. |
| -find_package(jpeg QUIET) |
| -if(JPEG_FOUND) |
| - set(JPEG_LINK_FLAGS ${JPEG_LIBRARIES}) |
| -else() |
| - pkg_check_modules(JPEG QUIET libjpeg) |
| - if(JPEG_FOUND) |
| - set(JPEG_INCLUDE_DIR ${JPEG_INCLUDE_DIRS}) |
| - set(JPEG_LINK_FLAGS ${JPEG_LDFLAGS}) |
| - else() |
| - find_path(JPEG_INCLUDE_DIR jpeglib.h) |
| - if(JPEG_INCLUDE_DIR) |
| - set(JPEG_FOUND ON) |
| - set(JPEG_LINK_FLAGS -ljpeg) |
| - endif() |
| - endif() |
| -endif() |
| - |
| include(GNUInstallDirs) |
| |
| SET(CMAKE_C_FLAGS_DEBUG "-g -DUVC_DEBUGGING") |
| @@ -57,14 +39,7 @@ include_directories( |
| ${LIBUSB_INCLUDE_DIRS} |
| ) |
| |
| -if(JPEG_FOUND) |
| - message(STATUS "Building libuvc with JPEG support.") |
| - include_directories(${JPEG_INCLUDE_DIR}) |
| - SET(LIBUVC_HAS_JPEG TRUE) |
| - SET(SOURCES ${SOURCES} src/frame-mjpeg.c) |
| -else() |
| - message(WARNING "JPEG not found. libuvc will not support JPEG decoding.") |
| -endif() |
| +message(WARNING "libuvc will not support JPEG decoding.") |
| |
| if(${CMAKE_BUILD_TARGET} MATCHES "Shared") |
| set(BUILD_UVC_SHARED TRUE) |
