File performous-0.7.0.patch of Package performous

File performous-0.7.0.patch of Package performous (Revision 5)

Currently displaying revision 5 , Show latest

---
 cmake/Modules/FindCairo.cmake    |    5 ++---
 cmake/Modules/FindMagick++.cmake |    6 +++---
 cmake/Modules/FindOpenCV.cmake   |    8 +-------
 cmake/Modules/FindPango.cmake    |    7 +++----
 4 files changed, 9 insertions(+), 17 deletions(-)

--- performous-0.7.0.orig/cmake/Modules/FindCairo.cmake
+++ performous-0.7.0/cmake/Modules/FindCairo.cmake
@@ -8,7 +8,6 @@
 include(LibFindMacros)
 
 # Dependencies
-libfind_package(Cairo Freetype)
 
 # Use pkg-config to get hints about paths
 libfind_pkg_check_modules(Cairo_PKGCONF cairo)
@@ -28,7 +27,7 @@ find_library(Cairo_LIBRARY
 
 # Set the include dir variables and the libraries and let libfind_process do the rest.
 # NOTE: Singular variables for this library, plural for libraries this this lib depends on.
-set(Cairo_PROCESS_INCLUDES Cairo_INCLUDE_DIR Freetype_INCLUDE_DIRS)
-set(Cairo_PROCESS_LIBS Cairo_LIBRARY Freetype_LIBRARIES)
+set(Cairo_PROCESS_INCLUDES Cairo_INCLUDE_DIR)
+set(Cairo_PROCESS_LIBS Cairo_LIBRARY)
 libfind_process(Cairo)
 
--- performous-0.7.0.orig/cmake/Modules/FindMagick++.cmake
+++ performous-0.7.0/cmake/Modules/FindMagick++.cmake
@@ -21,13 +21,13 @@ find_path(Magick++_INCLUDE_DIR
 
 # Finally the library itself
 find_library(Magick++_LIBRARY
-  NAMES Magick++ CORE_RL_magick++_
+  NAMES ${Magick++_PKGCONF_LIBRARIES}
   PATHS ${Magick++_PKGCONF_LIBRARY_DIRS}
 )
 
 # Set the include dir variables and the libraries and let libfind_process do the rest.
 # NOTE: Singular variables for this library, plural for libraries this this lib depends on.
-set(Magick++_PROCESS_INCLUDES Magick++_INCLUDE_DIR Magick_INCLUDE_DIRS)
-set(Magick++_PROCESS_LIBS Magick++_LIBRARY Magick_LIBRARIES)
+set(Magick++_PROCESS_INCLUDES Magick++_INCLUDE_DIR)
+set(Magick++_PROCESS_LIBS Magick++_LIBRARY)
 libfind_process(Magick++)
 
--- performous-0.7.0.orig/cmake/Modules/FindOpenCV.cmake
+++ performous-0.7.0/cmake/Modules/FindOpenCV.cmake
@@ -114,13 +114,7 @@ if(EXISTS "${OpenCV_DIR}")
 
       endif(NOT EXISTS ${VERSION_FILE_DIR})
 
-      #file(STRINGS ${OpenCV_INCLUDE_DIR}/cvver.h OpenCV_VERSIONS_TMP REGEX "^#define CV_[A-Z]+_VERSION[ \t]+[0-9]+$")
-      file(STRINGS ${VERSION_FILE} OpenCV_VERSIONS_TMP REGEX "^#define CV_[A-Z]+_VERSION[ \t]+[0-9]+$")
-
-      string(REGEX REPLACE ".*#define CV_MAJOR_VERSION[ \t]+([0-9]+).*" "\\1" OpenCV_VERSION_MAJOR ${OpenCV_VERSIONS_TMP})
-      string(REGEX REPLACE ".*#define CV_MINOR_VERSION[ \t]+([0-9]+).*" "\\1" OpenCV_VERSION_MINOR ${OpenCV_VERSIONS_TMP})
-      string(REGEX REPLACE ".*#define CV_SUBMINOR_VERSION[ \t]+([0-9]+).*" "\\1" OpenCV_VERSION_PATCH ${OpenCV_VERSIONS_TMP})
-      set(OpenCV_VERSION ${OpenCV_VERSION_MAJOR}.${OpenCV_VERSION_MINOR}.${OpenCV_VERSION_PATCH} CACHE STRING "" FORCE)
+      set(OpenCV_VERSION ${OPENCV_PKGCONF_VERSION})
 
       if(WIN32 OR NOT PKG_CONFIG_FOUND)
 	set(CVLIB_SUFFIX "${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}")
--- performous-0.7.0.orig/cmake/Modules/FindPango.cmake
+++ performous-0.7.0/cmake/Modules/FindPango.cmake
@@ -8,7 +8,6 @@
 include(LibFindMacros)
 
 # Dependencies
-libfind_package(Pango Freetype)
 libfind_package(Pango Glib)
 libfind_package(Pango GObject)
 
@@ -24,13 +23,13 @@ find_path(Pango_INCLUDE_DIR
 
 # Finally the library itself
 find_library(Pango_LIBRARY
-  NAMES pango-1.0
+  NAMES ${Pango_PKGCONF_LIBRARIES}
   PATHS ${Pango_PKGCONF_LIBRARY_DIRS}
 )
 
 # Set the include dir variables and the libraries and let libfind_process do the rest.
 # NOTE: Singular variables for this library, plural for libraries this this lib depends on.
-set(Pango_PROCESS_INCLUDES Pango_INCLUDE_DIR Freetype_INCLUDE_DIRS Glib_INCLUDE_DIRS)
-set(Pango_PROCESS_LIBS Pango_LIBRARY Freetype_LIBRARIES Glib_LIBRARIES GObject_LIBRARIES)
+set(Pango_PROCESS_INCLUDES Pango_INCLUDE_DIR Glib_INCLUDE_DIRS)
+set(Pango_PROCESS_LIBS Pango_LIBRARY Glib_LIBRARIES GObject_LIBRARIES)
 libfind_process(Pango)