forked from pool/opencv
Marcus Rueckert
e96c4df78c
Accepted submit request 58141 from user coolo OBS-URL: https://build.opensuse.org/request/show/58141 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=14
67 lines
3.6 KiB
Diff
67 lines
3.6 KiB
Diff
diff -urN OpenCV-2.2.0-orig/3rdparty/CMakeLists.txt OpenCV-2.2.0/3rdparty/CMakeLists.txt
|
|
--- OpenCV-2.2.0-orig/3rdparty/CMakeLists.txt 2010-12-05 05:35:23.000000000 +0200
|
|
+++ OpenCV-2.2.0/3rdparty/CMakeLists.txt 2010-12-27 23:34:49.000000000 +0200
|
|
@@ -3,7 +3,6 @@
|
|
endif()
|
|
|
|
add_subdirectory(lapack)
|
|
-add_subdirectory(zlib)
|
|
if(WITH_JASPER AND NOT JASPER_FOUND)
|
|
add_subdirectory(libjasper)
|
|
endif()
|
|
diff -urN OpenCV-2.2.0-orig/modules/core/CMakeLists.txt OpenCV-2.2.0/modules/core/CMakeLists.txt
|
|
--- OpenCV-2.2.0-orig/modules/core/CMakeLists.txt 2010-12-05 05:35:24.000000000 +0200
|
|
+++ OpenCV-2.2.0/modules/core/CMakeLists.txt 2010-12-27 23:34:49.000000000 +0200
|
|
@@ -1,3 +1,3 @@
|
|
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/include")
|
|
-set(deps opencv_lapack zlib)
|
|
+set(deps opencv_lapack z)
|
|
define_opencv_module(core ${deps})
|
|
diff -urN OpenCV-2.2.0-orig/modules/highgui/CMakeLists.txt OpenCV-2.2.0/modules/highgui/CMakeLists.txt
|
|
--- OpenCV-2.2.0-orig/modules/highgui/CMakeLists.txt 2010-12-05 05:35:24.000000000 +0200
|
|
+++ OpenCV-2.2.0/modules/highgui/CMakeLists.txt 2010-12-27 23:34:49.000000000 +0200
|
|
@@ -276,8 +276,8 @@
|
|
endif()
|
|
|
|
if(WITH_PNG AND NOT PNG_FOUND)
|
|
- add_dependencies(${the_target} libpng zlib)
|
|
- #target_link_libraries(${the_target} libpng zlib)
|
|
+ add_dependencies(${the_target} libpng z)
|
|
+ #target_link_libraries(${the_target} libpng z)
|
|
endif()
|
|
|
|
if(WITH_TIFF AND NOT TIFF_FOUND)
|
|
@@ -285,7 +285,7 @@
|
|
#target_link_libraries(${the_target} libtiff)
|
|
endif()
|
|
|
|
-target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} opencv_core opencv_imgproc zlib ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${TIFF_LIBRARIES} ${JASPER_LIBRARIES} ${HIGHGUI_LIBRARIES} ${OPENEXR_LIBRARIES})
|
|
+target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} opencv_core opencv_imgproc z ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${TIFF_LIBRARIES} ${JASPER_LIBRARIES} ${HIGHGUI_LIBRARIES} ${OPENEXR_LIBRARIES})
|
|
|
|
if(APPLE)
|
|
target_link_libraries(${the_target} "-lbz2 -framework Cocoa -framework QuartzCore")
|
|
diff -urN OpenCV-2.2.0-orig/OpenCVConfig.cmake.in OpenCV-2.2.0/OpenCVConfig.cmake.in
|
|
--- OpenCV-2.2.0-orig/OpenCVConfig.cmake.in 2010-12-05 05:35:25.000000000 +0200
|
|
+++ OpenCV-2.2.0/OpenCVConfig.cmake.in 2010-12-27 23:35:08.000000000 +0200
|
|
@@ -91,7 +91,7 @@
|
|
|
|
set(OpenCV_LIBS @OPENCV_LINKER_LIBS@ @IPP_LIBS@ @HIGHGUI_LIBRARIES@ ${OpenCV_LIBS})
|
|
|
|
- set(OPENCV_EXTRA_COMPONENTS @JPEG_LIBRARIES@ @PNG_LIBRARIES@ @TIFF_LIBRARIES@ @JASPER_LIBRARIES@ zlib opencv_lapack)
|
|
+ set(OPENCV_EXTRA_COMPONENTS @JPEG_LIBRARIES@ @PNG_LIBRARIES@ @TIFF_LIBRARIES@ @JASPER_LIBRARIES@ z opencv_lapack)
|
|
|
|
if (CMAKE_MAJOR_VERSION GREATER 2 OR CMAKE_MINOR_VERSION GREATER 4)
|
|
foreach(__EXTRA_LIB ${OPENCV_EXTRA_COMPONENTS})
|
|
diff -urN OpenCV-2.2.0-orig/OpenCVFindOpenEXR.cmake OpenCV-2.2.0/OpenCVFindOpenEXR.cmake
|
|
--- OpenCV-2.2.0-orig/OpenCVFindOpenEXR.cmake 2010-12-05 05:35:25.000000000 +0200
|
|
+++ OpenCV-2.2.0/OpenCVFindOpenEXR.cmake 2010-12-27 23:34:49.000000000 +0200
|
|
@@ -44,7 +44,7 @@
|
|
IF (OPENEXR_INCLUDE_PATH AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY)
|
|
SET(OPENEXR_FOUND TRUE)
|
|
SET(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_PATH} CACHE STRING "The include paths needed to use OpenEXR")
|
|
- SET(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} zlib CACHE STRING "The libraries needed to use OpenEXR")
|
|
+ SET(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} z CACHE STRING "The libraries needed to use OpenEXR")
|
|
ENDIF ()
|
|
|
|
IF(OPENEXR_FOUND)
|