r45245 - in /packages/opencv/trunk/debian/patches: 0005-build-static-libs.patch build-static-libs.patch

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Mon Jul 16 06:28:41 2012
New Revision: 45245

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45245
Log:
Update and rename build-static-libs.patch

Added:
    packages/opencv/trunk/debian/patches/build-static-libs.patch
      - copied, changed from r45121, packages/opencv/trunk/debian/patches/0005-build-static-libs.patch
Removed:
    packages/opencv/trunk/debian/patches/0005-build-static-libs.patch

Copied: packages/opencv/trunk/debian/patches/build-static-libs.patch (from r45121, packages/opencv/trunk/debian/patches/0005-build-static-libs.patch)
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/patches/build-static-libs.patch?rev=45245&op=diff
==============================================================================
--- packages/opencv/trunk/debian/patches/0005-build-static-libs.patch (original)
+++ packages/opencv/trunk/debian/patches/build-static-libs.patch Mon Jul 16 06:28:41 2012
@@ -1,20 +1,20 @@
-diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake
-index 8d37ffe..625ea3e 100644
---- a/cmake/OpenCVModule.cmake
+diff --git a/cmake/OpenCVModule.cmake.x b/cmake/OpenCVModule.cmake
+index 543f997..c414b7d 100644
+--- a/cmake/OpenCVModule.cmake.x
 +++ b/cmake/OpenCVModule.cmake
-@@ -94,6 +94,7 @@ macro(ocv_add_module _name)
+@@ -90,6 +90,7 @@ macro(ocv_add_module _name)
    string(TOLOWER "${_name}" name)
    string(REGEX REPLACE "^opencv_" "" ${name} "${name}")
    set(the_module opencv_${name})
-+  set(the_module_s opencv_${name}_s) 
++  set(the_module_s opencv_${name}_s)
  
    # the first pass - collect modules info, the second pass - create targets
    if(OPENCV_INITIAL_PASS)
-@@ -446,6 +447,7 @@ endmacro()
+@@ -441,6 +442,7 @@ endmacro()
  #   ocv_create_module(SKIP_LINK)
  macro(ocv_create_module)
    add_library(${the_module} ${OPENCV_MODULE_TYPE} ${OPENCV_MODULE_${the_module}_HEADERS} ${OPENCV_MODULE_${the_module}_SOURCES})
 +  add_library(${the_module_s} STATIC ${OPENCV_MODULE_TYPE} ${OPENCV_MODULE_${the_module}_HEADERS} ${OPENCV_MODULE_${the_module}_SOURCES})
+ 
    if(NOT "${ARGN}" STREQUAL "SKIP_LINK")
      target_link_libraries(${the_module} ${OPENCV_MODULE_${the_module}_DEPS} ${OPENCV_MODULE_${the_module}_DEPS_EXT} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} ${ARGN})
-   endif()