From 60988dd8a2addd6358eeac691a0cb43090299633 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Thu, 11 May 2006 18:32:40 -0400 Subject: [PATCH] ENH: honor REQUIRED flag Alex --- Modules/FindJPEG.cmake | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/Modules/FindJPEG.cmake b/Modules/FindJPEG.cmake index c403fb6d2..339781788 100644 --- a/Modules/FindJPEG.cmake +++ b/Modules/FindJPEG.cmake @@ -18,12 +18,23 @@ FIND_LIBRARY(JPEG_LIBRARY PATHS /usr/lib /usr/local/lib ) -IF (JPEG_LIBRARY) - IF (JPEG_INCLUDE_DIR) - SET(JPEG_LIBRARIES ${JPEG_LIBRARY}) - SET(JPEG_FOUND "YES") - ENDIF (JPEG_INCLUDE_DIR) -ENDIF (JPEG_LIBRARY) +IF (JPEG_LIBRARY AND JPEG_INCLUDE_DIR) + SET(JPEG_LIBRARIES ${JPEG_LIBRARY}) + SET(JPEG_FOUND "YES") +ELSE (JPEG_LIBRARY AND JPEG_INCLUDE_DIR) + SET(JPEG_FOUND "NO") +ENDIF (JPEG_LIBRARY AND JPEG_INCLUDE_DIR) + + +IF (JPEG_FOUND) + IF (NOT JPEG_FIND_QUIETLY) + MESSAGE(STATUS "Found JPEG: ${JPEG_LIBRARIES}") + ENDIF (NOT JPEG_FIND_QUIETLY) +ELSE (JPEG_FOUND) + IF (JPEG_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find JPEG library") + ENDIF (JPEG_FIND_REQUIRED) +ENDIF (JPEG_FOUND) # Deprecated declarations. SET (NATIVE_JPEG_INCLUDE_PATH ${JPEG_INCLUDE_DIR} )