|
 |
e13407e |
diff -up OpenCV-2.2.0/3rdparty/CMakeLists.txt.nointernal OpenCV-2.2.0/3rdparty/CMakeLists.txt
|
|
|
e13407e |
--- OpenCV-2.2.0/3rdparty/CMakeLists.txt.nointernal 2010-12-05 04:35:23.000000000 +0100
|
|
|
e13407e |
+++ OpenCV-2.2.0/3rdparty/CMakeLists.txt 2010-12-07 16:00:53.510070005 +0100
|
|
|
e13407e |
@@ -2,8 +2,12 @@ if(ANDROID)
|
|
|
e13407e |
configure_file("${CMAKE_SOURCE_DIR}/Android.mk.modules.in" "${CMAKE_CURRENT_BINARY_DIR}/Android.mk")
|
|
|
e13407e |
endif()
|
|
|
e13407e |
|
|
|
e13407e |
-add_subdirectory(lapack)
|
|
|
e13407e |
-add_subdirectory(zlib)
|
|
|
e13407e |
+#if(WITH_LAPACK AND NOT LAPACK_FOUND)
|
|
|
e13407e |
+# add_subdirectory(lapack)
|
|
|
e13407e |
+#endif()
|
|
|
e13407e |
+#if(WITH_ZLIB AND NOT ZLIB_FOUND)
|
|
|
e13407e |
+# add_subdirectory(zlib)
|
|
|
e13407e |
+#endif()
|
|
|
e13407e |
if(WITH_JASPER AND NOT JASPER_FOUND)
|
|
|
e13407e |
add_subdirectory(libjasper)
|
|
|
e13407e |
endif()
|
|
|
e13407e |
diff -up OpenCV-2.2.0/CMakeLists.txt.nointernal OpenCV-2.2.0/CMakeLists.txt
|
|
|
e13407e |
--- OpenCV-2.2.0/CMakeLists.txt.nointernal 2010-12-05 04:35:23.000000000 +0100
|
|
|
e13407e |
+++ OpenCV-2.2.0/CMakeLists.txt 2010-12-07 16:00:53.532070005 +0100
|
|
|
e13407e |
@@ -280,6 +280,8 @@ set(WITH_JPEG ON CACHE BOOL "Include JPE
|
|
|
e13407e |
set(WITH_JASPER ON CACHE BOOL "Include JPEG2K support")
|
|
|
e13407e |
set(WITH_TIFF ON CACHE BOOL "Include TIFF support")
|
|
|
e13407e |
set(WITH_OPENEXR ON CACHE BOOL "Include ILM support via OpenEXR")
|
|
|
e13407e |
+set(WITH_LAPACK ON CACHE BOOL "Include LAPACK support")
|
|
|
e13407e |
+set(WITH_ZLIB ON CACHE BOOL "Include ZLIB support")
|
|
|
e13407e |
|
|
|
e13407e |
if(UNIX)
|
|
|
e13407e |
set(WITH_FFMPEG ON CACHE BOOL "Include FFMPEG support")
|
|
|
e13407e |
diff -up OpenCV-2.2.0/modules/core/CMakeLists.txt.nointernal OpenCV-2.2.0/modules/core/CMakeLists.txt
|
|
|
e13407e |
--- OpenCV-2.2.0/modules/core/CMakeLists.txt.nointernal 2010-12-05 04:35:24.000000000 +0100
|
|
|
e13407e |
+++ OpenCV-2.2.0/modules/core/CMakeLists.txt 2010-12-07 16:47:14.767070005 +0100
|
|
|
e13407e |
@@ -1,3 +1,11 @@
|
|
|
e13407e |
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/include")
|
|
|
e13407e |
-set(deps opencv_lapack zlib)
|
|
|
e13407e |
+if(WITH_LAPACK AND NOT LAPACK_FOUND)
|
|
|
e13407e |
+ if(WITH_ZLIB AND NOT ZLIB_FOUND)
|
|
|
e13407e |
+ set(deps opencv_lapack zlib)
|
|
|
e13407e |
+ else()
|
|
|
e13407e |
+ set(deps lapack z)
|
|
|
e13407e |
+ endif()
|
|
|
e13407e |
define_opencv_module(core ${deps})
|
|
|
e13407e |
+else()
|
|
|
e13407e |
+define_opencv_module(core lapack z)
|
|
|
e13407e |
+endif()
|
|
|
e13407e |
diff -up OpenCV-2.2.0/modules/highgui/CMakeLists.txt.nointernal OpenCV-2.2.0/modules/highgui/CMakeLists.txt
|
|
|
e13407e |
--- OpenCV-2.2.0/modules/highgui/CMakeLists.txt.nointernal 2010-12-05 04:35:24.000000000 +0100
|
|
|
e13407e |
+++ OpenCV-2.2.0/modules/highgui/CMakeLists.txt 2010-12-07 17:01:11.963070004 +0100
|
|
|
e13407e |
@@ -285,7 +285,7 @@ if(WITH_TIFF AND NOT TIFF_FOUND)
|
|
|
e13407e |
#target_link_libraries(${the_target} libtiff)
|
|
|
e13407e |
endif()
|
|
|
e13407e |
|
|
|
e13407e |
-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})
|
|
|
e13407e |
+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})
|
|
|
e13407e |
|
|
|
e13407e |
if(APPLE)
|
|
|
e13407e |
target_link_libraries(${the_target} "-lbz2 -framework Cocoa -framework QuartzCore")
|
|
|
e13407e |
--- OpenCV-2.2.0/OpenCVFindOpenEXR.cmake.nointernal 2010-12-07 17:12:16.592070004 +0100
|
|
|
e13407e |
+++ OpenCV-2.2.0/OpenCVFindOpenEXR.cmake 2010-12-07 17:12:26.539070004 +0100
|
|
|
e13407e |
@@ -44,7 +44,7 @@ FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY
|
|
|
e13407e |
IF (OPENEXR_INCLUDE_PATH AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY)
|
|
|
e13407e |
SET(OPENEXR_FOUND TRUE)
|
|
|
e13407e |
SET(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_PATH} CACHE STRING "The include paths needed to use OpenEXR")
|
|
|
e13407e |
- SET(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} zlib CACHE STRING "The libraries needed to use OpenEXR")
|
|
|
e13407e |
+ SET(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR")
|
|
|
e13407e |
ENDIF ()
|
|
|
e13407e |
|
|
|
e13407e |
IF(OPENEXR_FOUND)
|