Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/opencv/files: opencv-2.3.1a-convert_sets_to_options.patch opencv-2.3.1a-nocaps.patch opencv-2.3.1a-libsuffix.patch
Date: Sun, 13 Nov 2011 14:27:26
Message-Id: 20111113142717.603BF2004B@flycatcher.gentoo.org
1 dilfridge 11/11/13 14:27:17
2
3 Added: opencv-2.3.1a-convert_sets_to_options.patch
4 opencv-2.3.1a-nocaps.patch
5 opencv-2.3.1a-libsuffix.patch
6 Log:
7 Version bump, thanks to Andreas Sturmlechner for his help
8
9 (Portage version: 2.1.10.34/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.1 media-libs/opencv/files/opencv-2.3.1a-convert_sets_to_options.patch
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/files/opencv-2.3.1a-convert_sets_to_options.patch?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/files/opencv-2.3.1a-convert_sets_to_options.patch?rev=1.1&content-type=text/plain
16
17 Index: opencv-2.3.1a-convert_sets_to_options.patch
18 ===================================================================
19 diff -ruN OpenCV-2.3.1-0-vanilla/CMakeLists.txt OpenCV-2.3.1-2-options/CMakeLists.txt
20 --- OpenCV-2.3.1-0-vanilla/CMakeLists.txt 2011-09-12 20:45:38.000000000 +0200
21 +++ OpenCV-2.3.1-2-options/CMakeLists.txt 2011-11-13 14:11:45.000000000 +0100
22 @@ -72,13 +72,13 @@
23 # Build static or dynamic libs?
24 # Default: dynamic libraries
25 # ----------------------------------------------------------------------------
26 -set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)")
27 +OPTION(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" ON)
28
29 # ----------------------------------------------------------------------------
30 # Include debug info into debug libs?
31 # Default: yes
32 # ----------------------------------------------------------------------------
33 -set(BUILD_WITH_DEBUG_INFO ON CACHE BOOL "Include debug info into debug libs")
34 +OPTION(BUILD_WITH_DEBUG_INFO "Include debug info into debug libs" ON)
35
36 # ----------------------------------------------------------------------------
37 # Get actual OpenCV version number from sources
38 @@ -318,23 +318,23 @@
39
40 # Build/install (or not) some apps:
41 # ===================================================
42 -set(BUILD_EXAMPLES OFF CACHE BOOL "Build all examples")
43 -set(INSTALL_C_EXAMPLES OFF CACHE BOOL "Install C examples")
44 -set(INSTALL_PYTHON_EXAMPLES OFF CACHE BOOL "Install Python examples")
45 +option(BUILD_EXAMPLES "Build all examples" OFF)
46 +option(INSTALL_C_EXAMPLES "Install C examples" OFF)
47 +option(INSTALL_PYTHON_EXAMPLES "Install Python examples" OFF)
48 if(ANDROID)
49 - set(INSTALL_ANDROID_EXAMPLES OFF CACHE BOOL "Install Android examples")
50 + option(INSTALL_ANDROID_EXAMPLES "Install Android examples" OFF)
51 endif()
52
53 # Build tests:
54 # ===================================================
55 -set(BUILD_TESTS ON CACHE BOOL "Build tests")
56 +option(BUILD_TESTS "Build tests" ON)
57
58 # Build 3rdparty libraries under unix
59 # ===================================================
60 if(WIN32)
61 - set(OPENCV_BUILD_3RDPARTY_LIBS TRUE CACHE BOOL "Build 3rd party libraries")
62 + option(OPENCV_BUILD_3RDPARTY_LIBS "Build 3rd party libraries" TRUE)
63 else()
64 - set(OPENCV_BUILD_3RDPARTY_LIBS FALSE CACHE BOOL "Build 3rd party libraries")
65 + option(OPENCV_BUILD_3RDPARTY_LIBS "Build 3rd party libraries" FALSE)
66 endif()
67
68 include(OpenCVPCHSupport.cmake REQUIRED)
69 @@ -344,7 +344,7 @@
70 endif()
71
72 if(PCHSupport_FOUND)
73 - SET(USE_PRECOMPILED_HEADERS ON CACHE BOOL "Use precompiled headers")
74 + option(USE_PRECOMPILED_HEADERS "Use precompiled headers" ON)
75 else()
76 SET(USE_PRECOMPILED_HEADERS OFF CACHE BOOL "Use precompiled headers" FORCE)
77 endif()
78 @@ -356,8 +356,8 @@
79 endif()
80
81 if(CMAKE_COMPILER_IS_GNUCXX)
82 - set(ENABLE_PROFILING OFF CACHE BOOL "Enable profiling in the GCC compiler (Add flags: -g -pg)")
83 - set(USE_OMIT_FRAME_POINTER ON CACHE BOOL "Enable -fomit-frame-pointer for GCC")
84 + option(ENABLE_PROFILING "Enable profiling in the GCC compiler (Add flags: -g -pg)" OFF)
85 + option(USE_OMIT_FRAME_POINTER "Enable -fomit-frame-pointer for GCC" ON)
86
87 if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64.*|x86_64.*)
88 set(X86_64 1)
89 @@ -376,59 +376,59 @@
90 #ELSE()
91 # SET(_USE_FAST_MATH ON)
92 #ENDIF()
93 - set(USE_FAST_MATH ${_USE_FAST_MATH} CACHE BOOL "Enable -ffast-math (not recommended for GCC 4.6.x)")
94 - set(ENABLE_SSE ON CACHE BOOL "Enable SSE instructions")
95 - set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 instructions")
96 - set(ENABLE_SSE3 OFF CACHE BOOL "Enable SSE3 instructions")
97 - set(ENABLE_SSSE3 OFF CACHE BOOL "Enable SSSE3 instructions")
98 - set(ENABLE_SSE41 OFF CACHE BOOL "Enable SSE4.1 instructions")
99 - set(ENABLE_SSE42 OFF CACHE BOOL "Enable SSE4.2 instructions")
100 + option(USE_FAST_MATH "Enable -ffast-math for GCC" ON)
101 + option(ENABLE_SSE "Enable SSE instructions" ON)
102 + option(ENABLE_SSE2 "Enable SSE2 instructions" ON)
103 + option(ENABLE_SSE3 "Enable SSE3 instructions" OFF)
104 + option(ENABLE_SSSE3 "Enable SSSE3 instructions" OFF)
105 + option(ENABLE_SSE41 "Enable SSE4.1 instructions" OFF)
106 + option(ENABLE_SSE42 "Enable SSE4.2 instructions" OFF)
107 endif()
108 endif()
109
110 if(MSVC)
111 - set(ENABLE_SSE ON CACHE BOOL "Enable SSE instructions for MSVC")
112 - set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 instructions for MSVC")
113 + option(ENABLE_SSE "Enable SSE instructions for MSVC" ON)
114 + option(ENABLE_SSE2 "Enable SSE2 instructions for MSVC" ON)
115 if(CMAKE_C_COMPILER MATCHES "icc")
116 - set(ENABLE_SSE3 OFF CACHE BOOL "Enable SSE3 instructions for ICC")
117 - set(ENABLE_SSE4_1 OFF CACHE BOOL "Enable SSE4.1 instructions for ICC")
118 + option(ENABLE_SSE3 "Enable SSE3 instructions for ICC" OFF)
119 + option(ENABLE_SSE4_1 "Enable SSE4.1 instructions for ICC" OFF)
120 endif()
121 endif()
122
123 # allow fine grained control over which libraries not to link, even if
124 # they are available on the system
125 # ====================================================================
126 -set(WITH_PNG ON CACHE BOOL "Include PNG support")
127 -set(WITH_JPEG ON CACHE BOOL "Include JPEG support")
128 -set(WITH_JASPER ON CACHE BOOL "Include JPEG2K support")
129 -set(WITH_TIFF ON CACHE BOOL "Include TIFF support")
130 -set(WITH_OPENEXR ON CACHE BOOL "Include ILM support via OpenEXR")
131 +option(WITH_PNG "Include PNG support" ON)
132 +option(WITH_JPEG "Include JPEG support" ON)
133 +option(WITH_JASPER "Include JPEG2K support" ON)
134 +option(WITH_TIFF "Include TIFF support" ON)
135 +option(WITH_OPENEXR "Include ILM support via OpenEXR" ON)
136
137 if(UNIX)
138 - set(WITH_FFMPEG ON CACHE BOOL "Include FFMPEG support")
139 + option(WITH_FFMPEG "Include FFMPEG support" ON)
140 if(NOT APPLE)
141 - set(WITH_UNICAP OFF CACHE BOOL "Include Unicap support (GPL)")
142 - set(WITH_GTK ON CACHE BOOL "Include GTK support")
143 - set(WITH_GSTREAMER ON CACHE BOOL "Include Gstreamer support")
144 - set(WITH_V4L ON CACHE BOOL "Include Video 4 Linux support")
145 - set(WITH_XINE OFF CACHE BOOL "Include Xine support (GPL)")
146 + option(WITH_UNICAP "Include Unicap support (GPL)" OFF)
147 + option(WITH_GTK "Include GTK support" ON)
148 + option(WITH_GSTREAMER "Include Gstreamer support" ON)
149 + option(WITH_V4L "Include Video 4 Linux support" ON)
150 + option(WITH_XINE "Include Xine support (GPL)" OFF)
151 endif()
152 - set(WITH_PVAPI ON CACHE BOOL "Include Prosilica GigE support")
153 - set(WITH_1394 ON CACHE BOOL "Include IEEE1394 support")
154 + option(WITH_PVAPI "Include Prosilica GigE support" ON)
155 + option(WITH_1394 "Include IEEE1394 support" ON)
156 endif()
157
158 if(APPLE)
159 - set(WITH_CARBON OFF CACHE BOOL "Use Carbon for UI instead of Cocoa")
160 - set(WITH_QUICKTIME OFF CACHE BOOL "Use QuickTime for Video I/O insted of QTKit")
161 + option(WITH_CARBON "Use Carbon for UI instead of Cocoa" OFF)
162 + option(WITH_QUICKTIME "Use QuickTime for Video I/O insted of QTKit" OFF)
163 endif()
164
165 -set(WITH_TBB OFF CACHE BOOL "Include Intel TBB support")
166 -set(WITH_IPP OFF CACHE BOOL "Include Intel IPP support")
167 -set(WITH_EIGEN ON CACHE BOOL "Include Eigen2/Eigen3 support")
168 -set(WITH_CUDA ON CACHE BOOL "Include NVidia Cuda Runtime support")
169 -
170 -set(WITH_OPENNI OFF CACHE BOOL "Include OpenNI support")
171 -set(WITH_XIMEA OFF CACHE BOOL "Include XIMEA cameras support")
172 +option(WITH_TBB "Include TBB support" OFF)
173 +option(WITH_IPP "Include Intel IPP support" OFF)
174 +option(WITH_EIGEN "Include Eigen2/Eigen3 support" ON)
175 +option(WITH_CUDA "Include NVidia Cuda Runtime support" ON)
176 +
177 +option(WITH_OPENNI "Include OpenNI support" OFF)
178 +option(WITH_XIMEA "Include XIMEA cameras support" OFF)
179
180 # ===================================================
181 # Macros that checks if module have been installed.
182 @@ -626,13 +626,13 @@
183 include(OpenCVFindOpenEXR.cmake)
184 endif()
185
186 -set(BUILD_DOCS ON CACHE BOOL "Build OpenCV Documentation")
187 +option(BUILD_DOCS "Build OpenCV Documentation" ON)
188
189 if(BUILD_DOCS)
190 include(OpenCVFindLATEX.cmake REQUIRED)
191 endif()
192
193 -set(BUILD_NEW_PYTHON_SUPPORT ON CACHE BOOL "Build with Python support")
194 +option(BUILD_NEW_PYTHON_SUPPORT "Build with Python support" ON)
195
196 if (WIN32)
197 if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
198 @@ -836,8 +836,8 @@
199 #YV
200 ############################### QT ################################
201
202 -set(WITH_QT OFF CACHE BOOL "Build with Qt Backend support")
203 -set(WITH_QT_OPENGL OFF CACHE BOOL "Add OpenGL extension to Qt")
204 +option(WITH_QT "Build with Qt Backend support" OFF)
205 +option(WITH_QT_OPENGL "Add OpenGL extension to Qt" OFF)
206
207 set(HAVE_QT 0)
208 set(HAVE_QT_OPENGL 0)
209 @@ -1054,7 +1054,7 @@
210 ################## Extra HighGUI libs on Windows ###################
211
212 if(WIN32)
213 - set(WITH_VIDEOINPUT ON CACHE BOOL "Build HighGUI with DirectShow support")
214 + option(WITH_VIDEOINPUT "Build HighGUI with DirectShow support" ON)
215 set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} comctl32 gdi32 ole32)
216
217 if(WITH_VIDEOINPUT)
218 @@ -1123,7 +1123,7 @@
219 # Set the maximum level of warnings:
220 # ----------------------------------------------------------------------------
221 # Should be set to true for development
222 -set(OPENCV_WARNINGS_ARE_ERRORS OFF CACHE BOOL "Treat warnings as errors")
223 +option(OPENCV_WARNINGS_ARE_ERRORS "Treat warnings as errors" OFF)
224 if (WIN32 AND ${CMAKE_GENERATOR} MATCHES "(MinGW)|(MSYS)")
225 set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG" CACHE STRING "")
226 endif()
227 @@ -1494,7 +1494,7 @@
228 #-----------------------------------
229 # Source package:
230 #-----------------------------------
231 -set(BUILD_PACKAGE ON CACHE BOOL "Enables 'make package_source' command")
232 +option(BUILD_PACKAGE "Build a installer with the SDK" ON)
233
234 if(BUILD_PACKAGE)
235 set(TARBALL_NAME "${CMAKE_PROJECT_NAME}-${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}.${OPENCV_VERSION_PATCH}")
236
237
238
239 1.1 media-libs/opencv/files/opencv-2.3.1a-nocaps.patch
240
241 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/files/opencv-2.3.1a-nocaps.patch?rev=1.1&view=markup
242 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/files/opencv-2.3.1a-nocaps.patch?rev=1.1&content-type=text/plain
243
244 Index: opencv-2.3.1a-nocaps.patch
245 ===================================================================
246 diff -ruN OpenCV-2.3.1-3-suffix/CMakeLists.txt OpenCV-2.3.1-4-caps/CMakeLists.txt
247 --- OpenCV-2.3.1-3-suffix/CMakeLists.txt 2011-11-13 14:33:26.000000000 +0100
248 +++ OpenCV-2.3.1-4-caps/CMakeLists.txt 2011-11-13 14:37:04.000000000 +0100
249 @@ -123,9 +123,9 @@
250 if(ANDROID OR WIN32)
251 set(OPENCV_DOC_INSTALL_PATH doc)
252 elseif(OPENCV_MANGLED_INSTALL_PATHS)
253 - set(OPENCV_DOC_INSTALL_PATH share/OpenCV-${OPENCV_VERSION}/doc)
254 + set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION}/)
255 else()
256 - set(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc)
257 + set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION}/)
258 endif()
259
260 if(ANDROID)
261 @@ -1347,12 +1347,12 @@
262 set(CMAKE_OPENCV2_INCLUDE_DIRS_CONFIGCMAKE "")
263 if(ANDROID)
264 set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/libs/\${ARMEABI_NDK_NAME}\"")
265 - set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/OpenCV/3rdparty/libs/\${ARMEABI_NDK_NAME}\"")
266 + set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/opencv/3rdparty/libs/\${ARMEABI_NDK_NAME}\"")
267 else()
268 set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/${OPENCV_LIB_INSTALL_PATH}\"")
269 - set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
270 + set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
271 if(OPENCV_MANGLED_INSTALL_PATHS)
272 - set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/OpenCV-${OPENCV_VERSION}/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
273 + set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/opencv-${OPENCV_VERSION}/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
274 endif()
275 endif()
276
277 @@ -1367,16 +1367,16 @@
278 # <prefix>/(share|lib)/<name>*/ (U)
279 # <prefix>/(share|lib)/<name>*/(cmake|CMake)/ (U)
280 if(OPENCV_MANGLED_INSTALL_PATHS)
281 - install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake DESTINATION share/OpenCV-${OPENCV_VERSION}/)
282 - install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/OpenCV-${OPENCV_VERSION}/)
283 + install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake DESTINATION share/opencv-${OPENCV_VERSION}/)
284 + install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/opencv-${OPENCV_VERSION}/)
285 else()
286 - install(FILES "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" DESTINATION share/OpenCV/)
287 - install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/OpenCV/)
288 + install(FILES "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" DESTINATION share/opencv/)
289 + install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/opencv/)
290 endif()
291 endif()
292
293 if(ANDROID)
294 - install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/android/android.toolchain.cmake" DESTINATION share/OpenCV)
295 + install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/android/android.toolchain.cmake" DESTINATION share/opencv)
296 endif()
297
298 # --------------------------------------------------------------------------------------------
299 @@ -1386,7 +1386,7 @@
300 set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/include\" \"\${OpenCV_CONFIG_PATH}/include/opencv\"")
301 set(CMAKE_OPENCV2_INCLUDE_DIRS_CONFIGCMAKE "")
302 set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/${OPENCV_LIB_INSTALL_PATH}\"")
303 - set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
304 + set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
305
306 exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/win-install/\"" OUTPUT_VARIABLE RET_VAL)
307 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
308 @@ -1439,7 +1439,7 @@
309 set(CMAKE_LIBS_DIR_CONFIGCMAKE "\$(OPENCV_THIS_DIR)/../..")
310
311 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCV.mk.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk" IMMEDIATE @ONLY)
312 - install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk DESTINATION share/OpenCV/)
313 + install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk DESTINATION share/opencv/)
314 endif(ANDROID)
315
316 # --------------------------------------------------------------------------------------------
317 diff -ruN OpenCV-2.3.1-3-suffix/data/CMakeLists.txt OpenCV-2.3.1-4-caps/data/CMakeLists.txt
318 --- OpenCV-2.3.1-3-suffix/data/CMakeLists.txt 2011-09-12 20:45:36.000000000 +0200
319 +++ OpenCV-2.3.1-4-caps/data/CMakeLists.txt 2011-11-13 14:35:08.000000000 +0100
320 @@ -2,6 +2,6 @@
321 file(GLOB LBP_CASCADES lbpcascades/*.xml)
322
323 if(NOT WIN32)
324 -install(FILES ${HAAR_CASCADES} DESTINATION share/OpenCV/haarcascades COMPONENT main)
325 -install(FILES ${LBP_CASCADES} DESTINATION share/OpenCV/lbpcascades COMPONENT main)
326 + install(FILES ${HAAR_CASCADES} DESTINATION share/opencv/haarcascades COMPONENT main)
327 + install(FILES ${LBP_CASCADES} DESTINATION share/opencv/lbpcascades COMPONENT main)
328 endif()
329
330
331
332 1.1 media-libs/opencv/files/opencv-2.3.1a-libsuffix.patch
333
334 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/files/opencv-2.3.1a-libsuffix.patch?rev=1.1&view=markup
335 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/files/opencv-2.3.1a-libsuffix.patch?rev=1.1&content-type=text/plain
336
337 Index: opencv-2.3.1a-libsuffix.patch
338 ===================================================================
339 diff -ruN OpenCV-2.3.1-2-options/CMakeLists.txt OpenCV-2.3.1-3-suffix/CMakeLists.txt
340 --- OpenCV-2.3.1-2-options/CMakeLists.txt 2011-11-13 14:11:45.000000000 +0100
341 +++ OpenCV-2.3.1-3-suffix/CMakeLists.txt 2011-11-13 14:33:26.000000000 +0100
342 @@ -18,7 +18,7 @@
343 # Add these standard paths to the search paths for FIND_LIBRARY
344 # to find libraries from these locations first
345 if(UNIX)
346 - set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib /usr/lib)
347 + set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib${LIB_SUFFIX} /usr/lib${LIB_SUFFIX})
348 endif()
349
350 # it _must_ go before PROJECT(OpenCV) in order to work
351 @@ -117,7 +117,7 @@
352
353 # SUBDIRECTORIES:
354 # Save libs and executables in the same place
355 -set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib" CACHE PATH "Output directory for libraries" )
356 +set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}" CACHE PATH "Output directory for libraries" )
357 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin" CACHE PATH "Output directory for applications" )
358
359 if(ANDROID OR WIN32)
360 @@ -665,9 +665,9 @@
361 OUTPUT_VARIABLE PYTHON_STD_PACKAGES_PATH
362 OUTPUT_STRIP_TRAILING_WHITESPACE)
363 if("${PYTHON_STD_PACKAGES_PATH}" MATCHES "site-packages")
364 - set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
365 + set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
366 else() #debian based assumed, install to the dist-packages.
367 - set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
368 + set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
369 endif()
370 endif()
371 if(CMAKE_HOST_WIN32)