From 943c553bf7d867d4f09e2d0c779af198b03e4c0b Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Sun, 11 Jun 2006 13:15:31 +0000 Subject: [PATCH] - convert it to use pkgconfig (so implicitely the minimum version required is 3.5.17, as first version that ships a .pc file) - be quiet if djvu was already found svn path=/branches/work/kde4/playground/graphics/cmake/; revision=550295 --- cmake/modules/modules/FindDjVuLibre.cmake | 69 +++++++++++++---------- 1 file changed, 39 insertions(+), 30 deletions(-) diff --git a/cmake/modules/modules/FindDjVuLibre.cmake b/cmake/modules/modules/FindDjVuLibre.cmake index 3e053a651..644f82f13 100644 --- a/cmake/modules/modules/FindDjVuLibre.cmake +++ b/cmake/modules/modules/FindDjVuLibre.cmake @@ -4,38 +4,47 @@ # DJVULIBRE_FOUND - system has the DjVuLibre library # DJVULIBRE_INCLUDE_DIR - the DjVuLibre include directory # DJVULIBRE_LIBRARY - Link this to use the DjVuLibre library -# -include(CheckLibraryExists) -# reset vars -set(DJVULIBRE_INCLUDE_DIR) -set(DJVULIBRE_LIBRARY) +if (DJVULIBRE_INCLUDE_DIR AND DJVULIBRE_LIBRARY) -find_path(DJVULIBRE_INCLUDE_DIR libdjvu/ddjvuapi.h - /usr/local/include - /usr/include - ${GNUWIN32_DIR}/include -) - -find_library(DJVULIBRE_LIBRARY NAMES djvulibre - PATHS - /usr/lib - /usr/local/lib - ${GNUWIN32_DIR}/lib -) - -if(DJVULIBRE_INCLUDE_DIR AND DJVULIBRE_LIBRARY) + # in cache already set(DJVULIBRE_FOUND TRUE) -endif(DJVULIBRE_INCLUDE_DIR AND DJVULIBRE_LIBRARY) -if (DJVULIBRE_FOUND) - if (NOT DJVULIBRE_FIND_QUIETLY) - message(STATUS "Found DjVuLibre: ${DJVULIBRE_LIBRARY}") - endif (NOT DJVULIBRE_FIND_QUIETLY) -else (DJVULIBRE_FOUND) - if (DJVULIBRE_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find DjVuLibre") - endif (DJVULIBRE_FIND_REQUIRED) -endif (DJVULIBRE_FOUND) +else (DJVULIBRE_INCLUDE_DIR AND DJVULIBRE_LIBRARY) -mark_as_advanced(DJVULIBRE_INCLUDE_DIR DJVULIBRE_LIBRARY) + include(UsePkgConfig) + + pkgconfig(ddjvuapi _ddjvuIncDir _ddjvuLinkDir ddjvuLinkFlags _ddjvuCflags) + + find_path(DJVULIBRE_INCLUDE_DIR libdjvu/ddjvuapi.h + ${_ddjvuIncDir} + /usr/local/include + /usr/include + ${GNUWIN32_DIR}/include + ) + + find_library(DJVULIBRE_LIBRARY NAMES djvulibre + PATHS + ${_ddjvuLinkDir} + /usr/lib + /usr/local/lib + ${GNUWIN32_DIR}/lib + ) + + if(DJVULIBRE_INCLUDE_DIR AND DJVULIBRE_LIBRARY) + set(DJVULIBRE_FOUND TRUE) + endif(DJVULIBRE_INCLUDE_DIR AND DJVULIBRE_LIBRARY) + + if (DJVULIBRE_FOUND) + if (NOT DJVULIBRE_FIND_QUIETLY) + message(STATUS "Found DjVuLibre: ${DJVULIBRE_LIBRARY}") + endif (NOT DJVULIBRE_FIND_QUIETLY) + else (DJVULIBRE_FOUND) + if (DJVULIBRE_FIND_REQUIRED) + message(FATAL_ERROR "Could NOT find DjVuLibre") + endif (DJVULIBRE_FIND_REQUIRED) + endif (DJVULIBRE_FOUND) + + mark_as_advanced(DJVULIBRE_INCLUDE_DIR DJVULIBRE_LIBRARY) + +endif (DJVULIBRE_INCLUDE_DIR AND DJVULIBRE_LIBRARY)