diff options
Diffstat (limited to 'fix-opencv-headers.patch')
| -rw-r--r-- | fix-opencv-headers.patch | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/fix-opencv-headers.patch b/fix-opencv-headers.patch index de84a68cdca9..8b47a9bf7eaa 100644 --- a/fix-opencv-headers.patch +++ b/fix-opencv-headers.patch @@ -2,35 +2,12 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6e45cae..081c00a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -74,7 +74,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libc++") - set(CMAKE_STATIC_LIBRARY_FLAGS "${CMAKE_STATIC_LIBRARY_FLAGS} -stdlib=libc++") -- -+ - ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "Windows") - list(APPEND PSMOVEAPI_REQUIRED_LIBS setupapi bthprops kernel32 ws2_32 winmm version imm32) - -@@ -101,8 +101,12 @@ ELSE() +@@ -91,5 +91,9 @@ list(APPEND PSMOVEAPI_REQUIRED_LIBS m) include_directories(${UDEV_INCLUDE_DIRS}) list(APPEND PSMOVEAPI_REQUIRED_LIBS ${UDEV_LIBRARIES}) - + + pkg_check_modules(V4L2 REQUIRED libv4l2) + include_directories(${V4L2_INCLUDE_DIRS}) + list(APPEND PSMOVEAPI_REQUIRED_LIBS ${V4L2_LIBRARIES}) + - pkg_check_modules(BLUEZ REQUIRED bluez) -- -+ - # auto-detect BlueZ version >= 5 - if(${BLUEZ_VERSION} VERSION_LESS "5.0") - set(INFO_BLUEZ5_SUPPORT "No") -@@ -147,7 +151,7 @@ file(GLOB PSMOVEAPI_HEADERS - - file (GLOB PSMOVEAPI_MATH_HEADERS - "${CMAKE_CURRENT_LIST_DIR}/math/*.h" -- "${CMAKE_CURRENT_LIST_DIR}/math/*.hpp" -+ "${CMAKE_CURRENT_LIST_DIR}/math/*.hpp" - ) - - file (GLOB PSMOVEAPI_MATH_SRC + pkg_check_modules(BLUEZ REQUIRED bluez>=5) |