[patch] ported multilib patch

opencv-2.1.0-multilib.patch (text/plain), 4.54 KB, created by Christophe Paccolat on 2010-05-19 18:09:28 UTC

--- 3rdparty/flann/CMakeLists.txt	2009-10-01 03:21:00.000000000 +0300
+++ 3rdparty/flann/CMakeLists.txt	2009-10-16 17:12:16.000000000 +0300
@@ -86,8 +86,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 (


--- tests/cxts/CMakeLists.txt	2010-05-18 23:47:35.707951055 +0200
+++ tests/cxts/CMakeLists.txt	2010-05-18 23:59:22.371298147 +0200
@@ -63,6 +63,6 @@
 if(WIN32)
 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)
 endif()
--- interfaces/ffopencv/CMakeLists.txt	2010-05-19 00:04:56.227959994 +0200
+++ interfaces/ffopencv/CMakeLists.txt	2010-05-19 00:04:43.317938065 +0200
@@ -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
     )
--- src/cvaux/CMakeLists.txt	2010-05-19 00:08:46.994621492 +0200
+++ src/cvaux/CMakeLists.txt	2010-05-19 00:08:34.597960763 +0200
@@ -76,8 +76,9 @@
 
 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
--- src/highgui/CMakeLists.txt	2010-05-19 00:14:03.964612972 +0200
+++ src/highgui/CMakeLists.txt	2010-05-19 00:13:49.584628897 +0200
@@ -282,8 +282,9 @@
 
 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


--- CMakeLists.txt.orig	2010-05-19 01:32:11.564657671 +0200
+++ CMakeLists.txt	2010-05-19 01:32:01.411273214 +0200
@@ -475,8 +475,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)
--- src/cv/CMakeLists.txt.orig	2010-05-19 01:34:02.307948121 +0200
+++ src/cv/CMakeLists.txt	2010-05-19 01:33:51.794605709 +0200
@@ -71,8 +71,9 @@
 
 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
--- src/cxcore/CMakeLists.txt.orig	2010-05-19 01:34:48.817961043 +0200
+++ src/cxcore/CMakeLists.txt	2010-05-19 01:34:38.167965094 +0200
@@ -71,8 +71,9 @@
 
 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}
--- src/ml/CMakeLists.txt.orig	2010-05-19 01:35:30.717938623 +0200
+++ src/ml/CMakeLists.txt	2010-05-19 01:35:20.427939880 +0200
@@ -61,8 +61,9 @@
 
 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