[opencv/f14/master] include the correct opencvconfig patch

Rex Dieter rdieter at fedoraproject.org
Thu Aug 26 15:01:18 UTC 2010


commit 071ec8a243ddbdb4c813e7659a45ff9e2f51eed1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Aug 26 10:05:57 2010 -0500

    include the correct opencvconfig patch

 opencv-2.0.0-opencvconfig.patch |   31 +++++++++++++++++++++++++++++++
 opencv-2.1.0-opencvconfig.patch |   23 -----------------------
 2 files changed, 31 insertions(+), 23 deletions(-)
---
diff --git a/opencv-2.0.0-opencvconfig.patch b/opencv-2.0.0-opencvconfig.patch
new file mode 100644
index 0000000..91325ec
--- /dev/null
+++ b/opencv-2.0.0-opencvconfig.patch
@@ -0,0 +1,31 @@
+diff -up OpenCV-2.0.0/CMakeLists.txt.opencvconfig OpenCV-2.0.0/CMakeLists.txt
+--- OpenCV-2.0.0/CMakeLists.txt.opencvconfig	2010-08-26 09:08:23.105288296 -0500
++++ OpenCV-2.0.0/CMakeLists.txt	2010-08-26 09:09:05.677277182 -0500
+@@ -739,7 +739,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_D
+ 
+ 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/)
++    install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/cmake/opencv/)
+ endif()
+ 
+ # --------------------------------------------------------------------------------------------
+diff -up OpenCV-2.0.0/OpenCVConfig.cmake.in.opencvconfig OpenCV-2.0.0/OpenCVConfig.cmake.in
+--- OpenCV-2.0.0/OpenCVConfig.cmake.in.opencvconfig	2009-09-30 19:20:57.000000000 -0500
++++ OpenCV-2.0.0/OpenCVConfig.cmake.in	2010-08-26 09:08:23.114288086 -0500
+@@ -13,6 +13,7 @@
+ #      - OpenCV_LIBS          : The list of libraries to links against.
+ #      - OpenCV_LIB_DIR       : The directory where lib files are. Calling LINK_DIRECTORIES
+ #                                with this path is NOT needed.
++#      - OpenCV_INCLUDE_DIRS  : The OpenCV include directories.
+ #      - OpenCV_VERSION       : The  version of this OpenCV build. Example: "1.2.0"
+ #      - OpenCV_VERSION_MAJOR : Major version part of OpenCV_VERSION. Example: "1"
+ #      - OpenCV_VERSION_MINOR : Minor version part of OpenCV_VERSION. Example: "2"
+@@ -29,6 +30,7 @@ get_filename_component(THIS_OPENCV_CONFI
+ # Include directories to add to the user project:
+ # ======================================================
+ INCLUDE_DIRECTORIES(@CMAKE_INCLUDE_DIRS_CONFIGCMAKE@)
++SET(OpenCV_INCLUDE_DIRS @CMAKE_INCLUDE_DIRS_CONFIGCMAKE@)
+ 
+ # ======================================================
+ # Link directories to add to the user project:


More information about the scm-commits mailing list