r46374 - /packages/opencv/trunk/debian/patches/build-static-libs

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Mon Nov 25 23:00:45 2013
New Revision: 46374

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46374
Log:
Update patches/build-static-libs

Modified:
    packages/opencv/trunk/debian/patches/build-static-libs

Modified: packages/opencv/trunk/debian/patches/build-static-libs
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/patches/build-static-libs?rev=46374&op=diff
==============================================================================
--- packages/opencv/trunk/debian/patches/build-static-libs	(original)
+++ packages/opencv/trunk/debian/patches/build-static-libs	Mon Nov 25 23:00:45 2013
@@ -1,11 +1,13 @@
 Description: Support build static libraries
 Author: Nobuhiro Iwamatsu <iwamatsu at debian.org>
 Forwarded: no
-Last-Update: <2013-08-07>
+Last-Update: <2013-11-23>
 
---- a/cmake/OpenCVModule.cmake	2013-08-07 08:18:12.000000000 +0900
-+++ b/cmake/OpenCVModule.cmake	2013-08-07 08:19:39.000000000 +0900
-@@ -90,6 +90,7 @@
+diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake
+index c923aba..acef84c 100644
+--- a/cmake/OpenCVModule.cmake
++++ b/cmake/OpenCVModule.cmake
+@@ -107,6 +107,7 @@ macro(ocv_add_module _name)
    string(TOLOWER "${_name}" name)
    string(REGEX REPLACE "^opencv_" "" ${name} "${name}")
    set(the_module opencv_${name})
@@ -13,12 +15,14 @@
  
    # the first pass - collect modules info, the second pass - create targets
    if(OPENCV_INITIAL_PASS)
-@@ -472,6 +473,8 @@
- macro(ocv_create_module)
-   add_library(${the_module} ${OPENCV_MODULE_TYPE} ${OPENCV_MODULE_${the_module}_HEADERS} ${OPENCV_MODULE_${the_module}_SOURCES}
-     "${OPENCV_CONFIG_FILE_INCLUDE_DIR}/cvconfig.h" "${OPENCV_CONFIG_FILE_INCLUDE_DIR}/opencv2/opencv_modules.hpp")
+@@ -533,6 +534,10 @@ macro(ocv_create_module)
+     "${OPENCV_CONFIG_FILE_INCLUDE_DIR}/cvconfig.h" "${OPENCV_CONFIG_FILE_INCLUDE_DIR}/opencv2/opencv_modules.hpp"
+     ${${the_module}_pch})
+ 
 +  add_library(${the_module_s} STATIC ${OPENCV_MODULE_TYPE} ${OPENCV_MODULE_${the_module}_HEADERS} ${OPENCV_MODULE_${the_module}_SOURCES}
-+    "${OPENCV_CONFIG_FILE_INCLUDE_DIR}/cvconfig.h" "${OPENCV_CONFIG_FILE_INCLUDE_DIR}/opencv2/opencv_modules.hpp")
- 
++    "${OPENCV_CONFIG_FILE_INCLUDE_DIR}/cvconfig.h" "${OPENCV_CONFIG_FILE_INCLUDE_DIR}/opencv2/opencv_modules.hpp"
++    ${${the_module}_pch})
++
    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})
+     target_link_libraries(${the_module} ${OPENCV_MODULE_${the_module}_DEPS})
+     target_link_libraries(${the_module} LINK_INTERFACE_LIBRARIES ${OPENCV_MODULE_${the_module}_DEPS})