[patch] opencv osx prefix patch

opencv-2.1.0-osx.patch (text/plain), 1.40 KB, created by Gijs Molenaar on 2010-06-20 13:54:47 UTC

diff -rupN OpenCV-2.1.0.orig/interfaces/python/CMakeLists.txt OpenCV-2.1.0/interfaces/python/CMakeLists.txt
--- OpenCV-2.1.0.orig/interfaces/python/CMakeLists.txt	2010-04-06 03:24:40.000000000 +0200
+++ OpenCV-2.1.0/interfaces/python/CMakeLists.txt	2010-04-06 22:19:16.000000000 +0200
@@ -43,5 +43,5 @@ if(WIN32)
             ARCHIVE DESTINATION "Python${PYTHON_VERSION_MAJOR_MINOR}/Lib/site-packages" COMPONENT main
             )
 else()
-    install(FILES ${LIBRARY_OUTPUT_PATH}/cv.so DESTINATION ${PYTHON_PACKAGES_PATH})
+    install(FILES ${LIBRARY_OUTPUT_PATH}/cv${CVPY_SUFFIX} DESTINATION ${PYTHON_PACKAGES_PATH})
 endif()
diff -rupN OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt OpenCV-2.1.0/src/highgui/CMakeLists.txt
--- OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt	2010-04-06 03:24:44.000000000 +0200
+++ OpenCV-2.1.0/src/highgui/CMakeLists.txt	2010-04-06 21:07:32.000000000 +0200
@@ -271,12 +271,14 @@ if(WIN32)
 endif()
 
 if(APPLE)
-	target_link_libraries(${the_target} "-lbz2 -framework Cocoa -framework QuickTime -framework CoreFoundation -framework QuartzCore")
+	target_link_libraries(${the_target} "-lbz2 -framework Cocoa -framework QuartzCore")
 	if(WITH_CARBON)
 		target_link_libraries(${the_target} "-framework Carbon")
 	endif()
 	if(NOT WITH_QUICKTIME)
 		target_link_libraries(${the_target} "-framework QTKit")
+    else()
+        target_link_libraries(${the_target} "-framework QuickTime")
 	endif()
 endif()