From 3c3016a1dff7df3966a1a627e11e9a41a8fadb51 Mon Sep 17 00:00:00 2001
From: Helio Castro <helio@kde.org>
Date: Tue, 11 Nov 2008 15:30:12 +0000
Subject: - Fix includedirs and add requires for pkgconfig

svn path=/trunk/KDE/kdelibs/; revision=882894
---
 modules/FindExiv2.cmake | 2 ++
 modules/FindXine.cmake  | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'modules')

diff --git a/modules/FindExiv2.cmake b/modules/FindExiv2.cmake
index 4895b6c4..c16e210b 100644
--- a/modules/FindExiv2.cmake
+++ b/modules/FindExiv2.cmake
@@ -12,6 +12,8 @@ if (EXIV2_INCLUDEDIR AND EXIV2_LIBRARIES)
 
 else (EXIV2_INCLUDEDIR AND EXIV2_LIBRARIES)
     if (NOT WIN32)
+        find_package(PkgConfig REQUIRED)
+        
         if(NOT EXIV2_MIN_VERSION)
             set(EXIV2_MIN_VERSION "0.12")
         endif(NOT EXIV2_MIN_VERSION)
diff --git a/modules/FindXine.cmake b/modules/FindXine.cmake
index 388e1ab7..6221f96a 100644
--- a/modules/FindXine.cmake
+++ b/modules/FindXine.cmake
@@ -7,18 +7,19 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-if (XINE_INCLUDEDIR AND XINE_LIBRARY)
+if (XINE_INCLUDEDIR AND XINE_LIBRARIES)
     # Already in cache, be silent
     set(Xine_FIND_QUIETLY TRUE)
-endif (XINE_INCLUDE_DIR AND XINE_LIBRARY)
+endif (XINE_INCLUDEDIR AND XINE_LIBRARIES)
 
 IF (NOT WIN32)
-    PKG_CHECK_MODULES(PKG_XINE libxine>=1.1.9)
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(XINE libxine>=1.1.9)
 ENDIF (NOT WIN32)
 
 if( XINE_FOUND )
     SET(CMAKE_REQUIRED_INCLUDES ${XINE_INCLUDEDIR})
-    SET(CMAKE_REQUIRED_LIBRARIES ${XINE_LIBRARY})
+    SET(CMAKE_REQUIRED_LIBRARIES ${XINE_LIBRARIES})
     if (NOT Xine_FIND_QUIETLY)
         message(STATUS "Found XINE: ${XINE_LIBRARY}")
     endif (NOT Xine_FIND_QUIETLY)
-- 
cgit v1.2.1