b77bb74311
Accepted submit request 55843 from user wstephenson OBS-URL: https://build.opensuse.org/request/show/55843 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=12
51 lines
1.4 KiB
Diff
51 lines
1.4 KiB
Diff
--- include/opencv/cxcore.hpp.orig
|
|
+++ include/opencv/cxcore.hpp
|
|
@@ -51,6 +51,7 @@
|
|
#include <algorithm>
|
|
#include <cmath>
|
|
#include <complex>
|
|
+#include <cstddef>
|
|
#include <map>
|
|
#include <new>
|
|
#include <string>
|
|
--- 3rdparty/CMakeLists.txt.orig
|
|
+++ 3rdparty/CMakeLists.txt
|
|
@@ -1,6 +1,5 @@
|
|
add_subdirectory(flann)
|
|
add_subdirectory(lapack)
|
|
-add_subdirectory(zlib)
|
|
if(WITH_JASPER AND NOT JASPER_FOUND)
|
|
add_subdirectory(libjasper)
|
|
endif()
|
|
--- CMakeLists.txt.orig
|
|
+++ CMakeLists.txt
|
|
@@ -840,7 +840,7 @@ IF(NOT BUILD_SHARED_LIBS)
|
|
set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} stdc++)
|
|
endif()
|
|
|
|
- set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} flann zlib opencv_lapack)
|
|
+ set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} flann z opencv_lapack)
|
|
endif()
|
|
|
|
|
|
--- src/cxcore/CMakeLists.txt.orig
|
|
+++ src/cxcore/CMakeLists.txt
|
|
@@ -53,7 +53,7 @@ set_target_properties(${the_target} PROP
|
|
)
|
|
|
|
# Add the required libraries for linking:
|
|
-target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} opencv_lapack zlib flann)
|
|
+target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} opencv_lapack z flann)
|
|
|
|
# Linker flag needed for Windows Mobile 5 and 6 SDKs
|
|
if(MSVC)
|
|
@@ -67,7 +67,7 @@ if(MSVC)
|
|
)
|
|
endif()
|
|
|
|
-add_dependencies(${the_target} opencv_lapack zlib)
|
|
+add_dependencies(${the_target} opencv_lapack)
|
|
|
|
install(TARGETS ${the_target}
|
|
RUNTIME DESTINATION bin COMPONENT main
|