Attachment 145612 Details for Bug 192046 – Proposed Unix.cmake patch

[patch] Proposed Unix.cmake patch

proposed-Unix.cmake.patch (text/plain), 1.57 KB, created by Raphael Kubo da Costa on 2014-08-10 16:24:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Raphael Kubo da Costa

Created: 2014-08-10 16:24:37 UTC

Size: 1.57 KB

patch

obsolete

>--- cmake/Unix.cmake.orig	2014-07-30 19:23:15.000000000 +0300
>+++ cmake/Unix.cmake	2014-08-10 19:21:35.000000000 +0300
>@@ -39,15 +39,15 @@
> 	set(OpenCV_LIBS "")
> 	set(OpenCV_FOUND false)
> 	if(PKG_CONFIG_FOUND) # not sure: pkgconfig is needed for old linux  with old old opencv systems
>-		pkg_check_modules(OpenCV  opencv>=2.1.0)
>+		pkg_check_modules(OpenCV  opencv-core>=2.1.0)
> 		set(OpenCV_LIBS ${OpenCV_LIBRARIES})
> 	endif(PKG_CONFIG_FOUND)
> 
> 	if(OpenCV_LIBS STREQUAL "")
>-		find_package(OpenCV 2.1.0 REQUIRED core imgproc)
>+		find_package(OpenCVCore 2.1.0 REQUIRED core imgproc)
> 	endif(OpenCV_LIBS STREQUAL "")
> 
>-	if(NOT OpenCV_FOUND)
>+	if(NOT OPENCVCORE_FOUND)
> 		message(FATAL_ERROR "OpenCV not found.") 
> 	else()
> 		add_definitions(-DWITH_OPENCV)
>@@ -60,8 +60,8 @@
> 
> # search for libraw
> if(ENABLE_RAW)
>-	if(NOT OpenCV_FOUND)
>-		message(FATAL_ERROR "OpenCV is mandotory when enabling RAW. You have to enable ENABLE_OPENCV")
>+	if(NOT OPENCVCORE_FOUND)
>+		message(FATAL_ERROR "OpenCV is mandotory when enabling RAW. You have to enable OPENCVCORE_FOUND")
> 	endif()
> 
> 	pkg_check_modules(LIBRAW  libraw>=0.12.0)
>@@ -76,7 +76,7 @@
> unset(TIFF_INCLUDE_DIR CACHE)
> unset(TIFF_LIBRARY CACHE)
> if(ENABLE_TIFF)
>-	if(NOT OpenCV_FOUND)
>+	if(NOT OPENCVCORE_FOUND)
> 		message(FATAL_ERROR "OpenCV is mandotory when enabling TIFF. You have to enable ENABLE_OPENCV")
> 	endif()
> 	find_package(TIFF)
>@@ -87,3 +87,6 @@
> 		message(FATAL_ERROR "libtiff was not found. It's mandatory when used with ENABLE_TIFF enabled.")
> 	endif()
> endif(ENABLE_TIFF)
>+
>+# sysinfo library
>+FIND_LIBRARY(SYSINFO_LIBRARY NAMES sysinfo)

Actions: View | Diff

Attachments on bug 192046: 144893 | 144922 | 144934 | 144941 | 145612 | 145999 | 150223