From 73ce3b48b77dfef13ffbc9efacdc85d1511f2a2c Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 16 Dec 2008 08:15:04 +0000 Subject: [PATCH] Port to find_package(PkgConfig) svn path=/trunk/KDE/kdegraphics/cmake/modules/; revision=897480 --- cmake/modules/FindDjVuLibre.cmake | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/cmake/modules/FindDjVuLibre.cmake b/cmake/modules/FindDjVuLibre.cmake index 0976ba086..4403127ed 100644 --- a/cmake/modules/FindDjVuLibre.cmake +++ b/cmake/modules/FindDjVuLibre.cmake @@ -12,23 +12,24 @@ if (DJVULIBRE_INCLUDE_DIR AND DJVULIBRE_LIBRARY) else (DJVULIBRE_INCLUDE_DIR AND DJVULIBRE_LIBRARY) IF (NOT WIN32) - include(UsePkgConfig) + find_package(PkgConfig) - pkgconfig(ddjvuapi _ddjvuIncDir _ddjvuLinkDir ddjvuLinkFlags _ddjvuCflags) + pkg_check_modules(PC_DJVULIBRE ddjvuapi) endif(NOT WIN32) - if(_ddjvuIncDir) find_path(DJVULIBRE_INCLUDE_DIR libdjvu/ddjvuapi.h - ${_ddjvuIncDir} + PATHS + ${PC_DJVULIBRE_INCLUDEDIR} + ${PC_DJVULIBRE_INCLUDE_DIRS} ${GNUWIN32_DIR}/include ) find_library(DJVULIBRE_LIBRARY NAMES djvulibre PATHS - ${_ddjvuLinkDir} + ${PC_DJVULIBRE_LIBDIR} + ${PC_DJVULIBRE_LIBRARY_DIRS} ${GNUWIN32_DIR}/lib ) - endif(_ddjvuIncDir) include(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(DjVuLibre DEFAULT_MSG DJVULIBRE_INCLUDE_DIR DJVULIBRE_LIBRARY )