Ticket #32528: patch-OpenCVConfig.cmake.in.diff

OpenCVConfig.cmake.in

@@ -40 +40 @@
 # Some additional settings are required if OpenCV is built as static libs
 set(OpenCV_SHARED @BUILD_SHARED_LIBS@)
 
+# OpenCV can exist for both shared and static libraries
+set(OPENCV_BUILT_SHARED_AND_STATIC @OPENCV_BUILT_SHARED_AND_STATIC@)
+if(OPENCV_BUILT_SHARED_AND_STATIC)
+    if (DEFINED BUILD_SHARED_LIBS AND NOT BUILD_SHARED_LIBS)
+        set(OpenCV_SHARED OFF)
+    else()
+        set(OpenCV_SHARED ON)
+    endif()
+endif(OPENCV_BUILT_SHARED_AND_STATIC)
+
 # Enables mangled install paths, that help with side by side installs
 set(OpenCV_USE_MANGLED_PATHS @OPENCV_MANGLED_INSTALL_PATHS@)
 
@@ -101 +111 @@
       endif()
   endforeach()
 else()
+  # Let cmake properly locate each OpenCV library
   foreach(__CVLIB ${OpenCV_LIB_COMPONENTS})
-    SET(OpenCV_LIBS ${OpenCV_LIBS} ${__CVLIB})
+    FIND_LIBRARY(${__CVLIB}_LIBRARY
+      NAMES ${__CVLIB}
+      PATHS ${OpenCV_LIB_DIR})
+    SET(OpenCV_LIBS ${OpenCV_LIBS} ${${__CVLIB}_LIBRARY})
   endforeach()
 endif()
 
@@ -139 +153 @@
     endif()
     
     if (APPLE)
-        set(OpenCV_LIBS ${OpenCV_LIBS} "-lbz2" "-framework Cocoa" "-framework QuartzCore" "-framework QTKit")
+        FIND_LIBRARY(BZ2_LIBRARY NAMES bz2 REQUIRED)
+
+        list(APPEND OpenCV_LIBS ${BZ2_LIBRARY} "-framework Cocoa" "-framework QuartzCore" "-framework QTKit")
     endif()
 ENDIF()