From cba8933a83c2e96698b85b980438f30385f8420e Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Sat, 8 Apr 2006 22:43:16 +0000 Subject: optimized gnuwin32 detection on windows - find gnuwin32 package location very early - removed GNUWIN32_INCLUDE_DIR/GNUWIN32_LIBRARY_DIR macros, because FindGNUWIN32.cmake sets now CMAKE_INCLUDE_PATH and CMAKE_LIBRARY_PATH - don't use pkgconfig on windows svn path=/trunk/KDE/kdelibs/; revision=527634 --- modules/FindJPEG.cmake | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'modules/FindJPEG.cmake') diff --git a/modules/FindJPEG.cmake b/modules/FindJPEG.cmake index 9113df28..7d624b30 100644 --- a/modules/FindJPEG.cmake +++ b/modules/FindJPEG.cmake @@ -7,20 +7,15 @@ # also defined, but not for general use are # JPEG_LIBRARY, where to find the JPEG library. -# under windows, try to find the base gnuwin32 directory, do nothing under UNIX -FIND_PACKAGE(GNUWIN32) - - FIND_PATH(JPEG_INCLUDE_DIR jpeglib.h /usr/local/include /usr/include -${GNUWIN32_DIR}/include ) SET(JPEG_NAMES ${JPEG_NAMES} jpeg) FIND_LIBRARY(JPEG_LIBRARY NAMES ${JPEG_NAMES} - PATHS /usr/lib /usr/local/lib ${GNUWIN32_DIR}/lib + PATHS /usr/lib /usr/local/lib ) IF (JPEG_LIBRARY) -- cgit v1.2.1