Ticket #32528: patch-CMakeLists.txt.diff

CMakeLists.txt

@@ -74 +74 @@
 # ----------------------------------------------------------------------------
 set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)")
 
+# Allow for building both dynamic and static libraries by running
+# cmake multiple times
+set(OPENCV_BUILT_SHARED_AND_STATIC OFF CACHE BOOL
+  "OpenCV is built both shared and static by successive calls to cmake")
+
+# Link static libraries against other static libraries on MacOS, if possible
+if(APPLE AND NOT BUILD_SHARED_LIBS)
+    set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.framework;.dylib")
+endif()
+
 # ----------------------------------------------------------------------------
 # Include debug info into debug libs?
 # Default: yes
@@ -439 +449 @@
 macro(CHECK_MODULE module_name define)
     set(${define} 0)
     if(PKG_CONFIG_FOUND)
+        if (BUILD_SHARED_LIBS)
+            set(ALIAS_PKG_BUILD_MODE "")
+        else()
+            set(ALIAS_PKG_BUILD_MODE "_STATIC")
+        endif()
         set(ALIAS               ALIASOF_${module_name})
         set(ALIAS_FOUND                 ${ALIAS}_FOUND)
         set(ALIAS_INCLUDE_DIRS   ${ALIAS}_INCLUDE_DIRS)
-        set(ALIAS_LIBRARY_DIRS   ${ALIAS}_LIBRARY_DIRS)
-        set(ALIAS_LIBRARIES         ${ALIAS}_LIBRARIES)
+        set(ALIAS_LIBRARY_DIRS   ${ALIAS}_${ALIAS_PKG_BUILD_MODE}_LIBRARY_DIRS)
+        set(ALIAS_LIBRARIES         ${ALIAS}${ALIAS_PKG_BUILD_MODE}_LIBRARIES)
 
         PKG_CHECK_MODULES(${ALIAS} ${module_name})
 
@@ -461 +476 @@
                 endif()
             endforeach()
 
-            list(APPEND HIGHGUI_LIBRARIES ${${ALIAS_LIBRARIES}})
+            foreach(TMP_LIB_NAME ${${ALIAS_LIBRARIES}})
+                FIND_LIBRARY(${TMP_LIB_NAME}_LIBRARY
+                  NAMES ${TMP_LIB_NAME}
+                  PATHS ${${ALIAS_LIBRARY_DIRS}})
+                list(APPEND HIGHGUI_LIBRARIES ${${TMP_LIB_NAME}_LIBRARY})
+            endforeach()
         endif()
     endif()
 endmacro()
@@ -509 +529 @@
       CHECK_MODULE(libavformat HAVE_FFMPEG_FORMAT)
       CHECK_MODULE(libavutil HAVE_FFMPEG_UTIL)
       CHECK_MODULE(libswscale HAVE_FFMPEG_SWSCALE)
+      CHECK_MODULE(orc-0.4 HAVE_ORC_04)
       CHECK_INCLUDE_FILE(libavformat/avformat.h HAVE_GENTOO_FFMPEG)
       CHECK_INCLUDE_FILE(ffmpeg/avformat.h HAVE_FFMPEG_FFMPEG)
       if(NOT HAVE_GENTOO_FFMPEG AND NOT HAVE_FFMPEG_FFMPEG)
@@ -702 +723 @@
 set(HAVE_SPHINX 0)
 if(SPHINX_PROCESS EQUAL 0)
     find_host_program(SPHINX_BUILD sphinx-build)
+    if (NOT SPHINX_BUILD)
+      find_host_program(SPHINX_BUILD sphinx-build-${PYTHON_VERSION_MAJOR_MINOR})
+    endif()
     if(SPHINX_BUILD)
         set(HAVE_SPHINX 1)
         message(STATUS "    Found Sphinx ${SPHINX_VERSION}: ${SPHINX_BUILD}")
@@ -1539 +1563 @@
 add_subdirectory(data)
 add_subdirectory(3rdparty)
 
-if(BUILD_EXAMPLES OR BUILD_ANDROID_EXAMPLES OR INSTALL_PYTHON_EXAMPLES)
+if(BUILD_EXAMPLES OR BUILD_ANDROID_EXAMPLES OR INSTALL_PYTHON_EXAMPLES
+   OR INSTALL_C_EXAMPLES)
     add_subdirectory(samples)
 endif()