[opencv/f14/master] Revert "include the correct opencvconfig patch"
Rex Dieter
rdieter at fedoraproject.org
Thu Aug 26 15:06:02 UTC 2010
commit 10942e63b207378ea9c1b58e45b0bf4782bbda32
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Thu Aug 26 10:10:59 2010 -0500
Revert "include the correct opencvconfig patch"
This reverts commit 071ec8a243ddbdb4c813e7659a45ff9e2f51eed1.
opencv-2.0.0-opencvconfig.patch | 31 -------------------------------
opencv-2.1.0-opencvconfig.patch | 23 +++++++++++++++++++++++
2 files changed, 23 insertions(+), 31 deletions(-)
---
diff --git a/opencv-2.1.0-opencvconfig.patch b/opencv-2.1.0-opencvconfig.patch
new file mode 100644
index 0000000..c7b044e
--- /dev/null
+++ b/opencv-2.1.0-opencvconfig.patch
@@ -0,0 +1,23 @@
+diff -up OpenCV-2.1.0/CMakeLists.txt.opencvconfig OpenCV-2.1.0/CMakeLists.txt
+--- OpenCV-2.1.0/CMakeLists.txt.opencvconfig 2010-08-26 08:26:56.403276842 -0500
++++ OpenCV-2.1.0/CMakeLists.txt 2010-08-26 08:31:20.543277559 -0500
+@@ -38,7 +38,7 @@ set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEB
+
+ project(OpenCV)
+
+-cmake_minimum_required(VERSION 2.4)
++cmake_minimum_required(VERSION 2.6.3)
+
+ if(MSVC)
+ set(CMAKE_USE_RELATIVE_PATHS ON CACHE INTERNAL "" FORCE)
+@@ -939,8 +939,8 @@ exec_program(mkdir ARGS "-p \"${CMAKE_BI
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
+
+ if(UNIX)
+- # For a command "FIND_PACKAGE(FOO)", CMake will look at the directory /usr/share|lib/FOO/FOOConfig.cmake, so:
+- install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/share/opencv/)
++ # For a command "FIND_PACKAGE(FOO)", CMake will look at the directory /usr/share|lib/cmake/FOO/FOOConfig.cmake, so:
++ install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/cmake/opencv/)
+ endif()
+
+ # --------------------------------------------------------------------------------------------
More information about the scm-commits
mailing list