[Cmake-commits] [cmake-commits] hoffman committed FindJPEG.cmake 1.14 1.15

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv4304

Modified Files:
	FindJPEG.cmake 
Log Message:
BUG: #7416  fix error when jpeg is not found


Index: FindJPEG.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJPEG.cmake,v
retrieving revision 1.14
retrieving revision 1.15
diff -C 2 -d -r1.14 -r1.15
*** FindJPEG.cmake	23 Jul 2007 13:49:52 -0000	1.14
--- FindJPEG.cmake	29 Jul 2008 20:41:29 -0000	1.15
***************
*** 24,28 ****
  # Deprecated declarations.
  SET (NATIVE_JPEG_INCLUDE_PATH ${JPEG_INCLUDE_DIR} )
! GET_FILENAME_COMPONENT (NATIVE_JPEG_LIB_PATH ${JPEG_LIBRARY} PATH)
  
  MARK_AS_ADVANCED(JPEG_LIBRARY JPEG_INCLUDE_DIR )
--- 24,30 ----
  # Deprecated declarations.
  SET (NATIVE_JPEG_INCLUDE_PATH ${JPEG_INCLUDE_DIR} )
! IF(JPEG_LIBRARY)
!   GET_FILENAME_COMPONENT (NATIVE_JPEG_LIB_PATH ${JPEG_LIBRARY} PATH)
! ENDIF(JPEG_LIBRARY)
  
  MARK_AS_ADVANCED(JPEG_LIBRARY JPEG_INCLUDE_DIR )