[packages/opencv.git] / opencv-2.1.0-multilib.patch

diff -ur OpenCV-2.1.0.orig/3rdparty/flann/CMakeLists.txt OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt
--- OpenCV-2.1.0.orig/3rdparty/flann/CMakeLists.txt	2010-04-06 04:24:34.000000000 +0300
+++ OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt	2010-07-27 21:41:18.000000000 +0300
@@ -89,8 +89,8 @@
 INSTALL (
     TARGETS flann  # flann_s
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION "lib${LIB_SUFFIX}"
+    ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
 )
 
 # INSTALL (
diff -ur OpenCV-2.1.0.orig/CMakeLists.txt OpenCV-2.1.0/CMakeLists.txt
--- OpenCV-2.1.0.orig/CMakeLists.txt	2010-04-06 04:24:37.000000000 +0300
+++ OpenCV-2.1.0/CMakeLists.txt	2010-07-27 21:56:58.000000000 +0300
@@ -467,8 +467,8 @@
 
     string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
     if(UNIX)
-        set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
-        set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
+        set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
+        set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
     endif()
     if(WIN32)
         get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)
diff -ur OpenCV-2.1.0.orig/interfaces/ffopencv/CMakeLists.txt OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt
--- OpenCV-2.1.0.orig/interfaces/ffopencv/CMakeLists.txt	2010-04-06 04:24:40.000000000 +0300
+++ OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt	2010-07-27 21:42:00.000000000 +0300
@@ -40,6 +40,6 @@
 
 install(TARGETS ${the_target}
 	RUNTIME DESTINATION bin COMPONENT main
-	ARCHIVE DESTINATION lib COMPONENT main
-	LIBRARY DESTINATION lib COMPONENT main
+	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
+	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
     )
diff -ur OpenCV-2.1.0.orig/src/cv/CMakeLists.txt OpenCV-2.1.0/src/cv/CMakeLists.txt
--- OpenCV-2.1.0.orig/src/cv/CMakeLists.txt	2010-04-06 04:24:42.000000000 +0300
+++ OpenCV-2.1.0/src/cv/CMakeLists.txt	2010-07-27 21:44:32.000000000 +0300
@@ -71,8 +71,8 @@
 
 install(TARGETS ${the_target}
     RUNTIME DESTINATION bin COMPONENT main
-    LIBRARY DESTINATION lib COMPONENT main
-    ARCHIVE DESTINATION lib COMPONENT main)
+    LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
+    ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
 
 install(FILES ${lib_hdrs}
     DESTINATION include/opencv
diff -ur OpenCV-2.1.0.orig/src/cvaux/CMakeLists.txt OpenCV-2.1.0/src/cvaux/CMakeLists.txt
--- OpenCV-2.1.0.orig/src/cvaux/CMakeLists.txt	2010-04-06 04:24:43.000000000 +0300
+++ OpenCV-2.1.0/src/cvaux/CMakeLists.txt	2010-07-27 21:43:22.000000000 +0300
@@ -76,8 +76,8 @@
 
 install(TARGETS ${the_target}
 	RUNTIME DESTINATION bin COMPONENT main
-	LIBRARY DESTINATION lib COMPONENT main
-	ARCHIVE DESTINATION lib COMPONENT main)
+	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
+	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
 
 install(FILES ${aux_hdrs_ext}
         DESTINATION include/opencv
diff -ur OpenCV-2.1.0.orig/src/cxcore/CMakeLists.txt OpenCV-2.1.0/src/cxcore/CMakeLists.txt
--- OpenCV-2.1.0.orig/src/cxcore/CMakeLists.txt	2010-04-06 04:24:44.000000000 +0300
+++ OpenCV-2.1.0/src/cxcore/CMakeLists.txt	2010-07-27 21:44:51.000000000 +0300
@@ -71,8 +71,8 @@
 
 install(TARGETS ${the_target}
     RUNTIME DESTINATION bin COMPONENT main
-    LIBRARY DESTINATION lib COMPONENT main
-    ARCHIVE DESTINATION lib COMPONENT main)
+    LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
+    ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
 
 # install each module headers separately
 install(FILES ${lib_hdrs}
diff -ur OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt OpenCV-2.1.0/src/highgui/CMakeLists.txt
--- OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt	2010-04-06 04:24:44.000000000 +0300
+++ OpenCV-2.1.0/src/highgui/CMakeLists.txt	2010-07-27 21:43:00.000000000 +0300
@@ -282,8 +282,8 @@
 
 install(TARGETS ${the_target}
 	RUNTIME DESTINATION bin COMPONENT main
-	LIBRARY DESTINATION lib COMPONENT main
-	ARCHIVE DESTINATION lib COMPONENT main)
+	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
+	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
 
 install(FILES ${highgui_ext_hdrs}
         DESTINATION include/opencv
diff -ur OpenCV-2.1.0.orig/src/ml/CMakeLists.txt OpenCV-2.1.0/src/ml/CMakeLists.txt
--- OpenCV-2.1.0.orig/src/ml/CMakeLists.txt	2010-04-06 04:24:45.000000000 +0300
+++ OpenCV-2.1.0/src/ml/CMakeLists.txt	2010-07-27 21:43:42.000000000 +0300
@@ -61,8 +61,8 @@
 
 install(TARGETS ${the_target}
 	RUNTIME DESTINATION bin COMPONENT main
-	LIBRARY DESTINATION lib COMPONENT main
-	ARCHIVE DESTINATION lib COMPONENT main)
+	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
+	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
 
 install(FILES ${lib_hdrs}
         DESTINATION include/opencv
Commit	Line	Data
95daeb66 AM	1	diff -ur OpenCV-2.1.0.orig/3rdparty/flann/CMakeLists.txt OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt
	2	--- OpenCV-2.1.0.orig/3rdparty/flann/CMakeLists.txt 2010-04-06 04:24:34.000000000 +0300
	3	+++ OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt 2010-07-27 21:41:18.000000000 +0300
	4	@@ -89,8 +89,8 @@
	5	INSTALL (
	6	TARGETS flann # flann_s
	7	RUNTIME DESTINATION bin
	8	- LIBRARY DESTINATION lib
	9	- ARCHIVE DESTINATION lib
	10	+ LIBRARY DESTINATION "lib${LIB_SUFFIX}"
	11	+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
	12	)
	13
	14	# INSTALL (
	15	diff -ur OpenCV-2.1.0.orig/CMakeLists.txt OpenCV-2.1.0/CMakeLists.txt
	16	--- OpenCV-2.1.0.orig/CMakeLists.txt 2010-04-06 04:24:37.000000000 +0300
	17	+++ OpenCV-2.1.0/CMakeLists.txt 2010-07-27 21:56:58.000000000 +0300
	18	@@ -467,8 +467,8 @@
	19
	20	string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
	21	if(UNIX)
	22	- set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
	23	- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
	24	+ set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
	25	+ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
	26	endif()
	27	if(WIN32)
	28	get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)
	29	diff -ur OpenCV-2.1.0.orig/interfaces/ffopencv/CMakeLists.txt OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt
	30	--- OpenCV-2.1.0.orig/interfaces/ffopencv/CMakeLists.txt 2010-04-06 04:24:40.000000000 +0300
	31	+++ OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt 2010-07-27 21:42:00.000000000 +0300
	32	@@ -40,6 +40,6 @@
	33
	34	install(TARGETS ${the_target}
	35	RUNTIME DESTINATION bin COMPONENT main
	36	- ARCHIVE DESTINATION lib COMPONENT main
	37	- LIBRARY DESTINATION lib COMPONENT main
	38	+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
	39	+ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
	40	)
	41	diff -ur OpenCV-2.1.0.orig/src/cv/CMakeLists.txt OpenCV-2.1.0/src/cv/CMakeLists.txt
	42	--- OpenCV-2.1.0.orig/src/cv/CMakeLists.txt 2010-04-06 04:24:42.000000000 +0300
	43	+++ OpenCV-2.1.0/src/cv/CMakeLists.txt 2010-07-27 21:44:32.000000000 +0300
	44	@@ -71,8 +71,8 @@
	45
	46	install(TARGETS ${the_target}
	47	RUNTIME DESTINATION bin COMPONENT main
	48	- LIBRARY DESTINATION lib COMPONENT main
	49	- ARCHIVE DESTINATION lib COMPONENT main)
	50	+ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
	51	+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
	52
	53	install(FILES ${lib_hdrs}
	54	DESTINATION include/opencv
	55	diff -ur OpenCV-2.1.0.orig/src/cvaux/CMakeLists.txt OpenCV-2.1.0/src/cvaux/CMakeLists.txt
	56	--- OpenCV-2.1.0.orig/src/cvaux/CMakeLists.txt 2010-04-06 04:24:43.000000000 +0300
	57	+++ OpenCV-2.1.0/src/cvaux/CMakeLists.txt 2010-07-27 21:43:22.000000000 +0300
	58	@@ -76,8 +76,8 @@
	59
	60	install(TARGETS ${the_target}
	61	RUNTIME DESTINATION bin COMPONENT main
	62	- LIBRARY DESTINATION lib COMPONENT main
	63	- ARCHIVE DESTINATION lib COMPONENT main)
	64	+ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
65	+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
66
67	install(FILES ${aux_hdrs_ext}
68	DESTINATION include/opencv
69	diff -ur OpenCV-2.1.0.orig/src/cxcore/CMakeLists.txt OpenCV-2.1.0/src/cxcore/CMakeLists.txt
70	--- OpenCV-2.1.0.orig/src/cxcore/CMakeLists.txt 2010-04-06 04:24:44.000000000 +0300
71	+++ OpenCV-2.1.0/src/cxcore/CMakeLists.txt 2010-07-27 21:44:51.000000000 +0300
72	@@ -71,8 +71,8 @@
73
74	install(TARGETS ${the_target}
75	RUNTIME DESTINATION bin COMPONENT main
76	- LIBRARY DESTINATION lib COMPONENT main
77	- ARCHIVE DESTINATION lib COMPONENT main)
78	+ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
79	+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
80
81	# install each module headers separately
82	install(FILES ${lib_hdrs}
83	diff -ur OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt OpenCV-2.1.0/src/highgui/CMakeLists.txt
84	--- OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt 2010-04-06 04:24:44.000000000 +0300
85	+++ OpenCV-2.1.0/src/highgui/CMakeLists.txt 2010-07-27 21:43:00.000000000 +0300
86	@@ -282,8 +282,8 @@
87
88	install(TARGETS ${the_target}
89	RUNTIME DESTINATION bin COMPONENT main
90	- LIBRARY DESTINATION lib COMPONENT main
91	- ARCHIVE DESTINATION lib COMPONENT main)
92	+ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
93	+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
94
95	install(FILES ${highgui_ext_hdrs}
96	DESTINATION include/opencv
97	diff -ur OpenCV-2.1.0.orig/src/ml/CMakeLists.txt OpenCV-2.1.0/src/ml/CMakeLists.txt
98	--- OpenCV-2.1.0.orig/src/ml/CMakeLists.txt 2010-04-06 04:24:45.000000000 +0300
99	+++ OpenCV-2.1.0/src/ml/CMakeLists.txt 2010-07-27 21:43:42.000000000 +0300
100	@@ -61,8 +61,8 @@
101
102	install(TARGETS ${the_target}
103	RUNTIME DESTINATION bin COMPONENT main
104	- LIBRARY DESTINATION lib COMPONENT main
105	- ARCHIVE DESTINATION lib COMPONENT main)
106	+ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
107	+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
108
109	install(FILES ${lib_hdrs}
110	DESTINATION include/opencv