diff --git a/cmake/modules/FindDjVuLibre.cmake b/cmake/modules/FindDjVuLibre.cmake index e19eb3d95..89324b7a3 100644 --- a/cmake/modules/FindDjVuLibre.cmake +++ b/cmake/modules/FindDjVuLibre.cmake @@ -11,10 +11,11 @@ if (DJVULIBRE_INCLUDE_DIR AND DJVULIBRE_LIBRARY) set(DJVULIBRE_FOUND TRUE) else (DJVULIBRE_INCLUDE_DIR AND DJVULIBRE_LIBRARY) + IF (NOT WIN32) + include(UsePkgConfig) - include(UsePkgConfig) - - pkgconfig(ddjvuapi _ddjvuIncDir _ddjvuLinkDir ddjvuLinkFlags _ddjvuCflags) + pkgconfig(ddjvuapi _ddjvuIncDir _ddjvuLinkDir ddjvuLinkFlags _ddjvuCflags) + endif(NOT WIN32) if(_ddjvuIncDir) find_path(DJVULIBRE_INCLUDE_DIR libdjvu/ddjvuapi.h diff --git a/cmake/modules/FindSane.cmake b/cmake/modules/FindSane.cmake index e6324b907..f2f93681b 100644 --- a/cmake/modules/FindSane.cmake +++ b/cmake/modules/FindSane.cmake @@ -11,7 +11,7 @@ if (SANE_INCLUDE_DIR) # Already in cache, be silent - set(SANE_FIND_QUIETLY TRUE) + set(Sane_FIND_QUIETLY TRUE) endif (SANE_INCLUDE_DIR) FIND_PATH(SANE_INCLUDE_DIR sane/sane.h @@ -39,9 +39,9 @@ if (SANE_FOUND) message(STATUS "Found sane: ${SANE_LIBRARIES}") endif (NOT Sane_FIND_QUIETLY) else (SANE_FOUND) - if (NOT Sane_FIND_QUIETLY) - message(STATUS "Did not find SANE") - endif (NOT Sane_FIND_QUIETLY) + if (NOT Sane_FIND_REQUIRED) + message(FATAL_ERROR "Did not find SANE") + endif (NOT Sane_FIND_REQUIRED) endif (SANE_FOUND) MARK_AS_ADVANCED(SANE_INCLUDE_DIR SANE_LIBRARIES SANE_LIBRARY)