diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2006-04-08 22:43:16 +0000 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2006-04-08 22:43:16 +0000 |
| commit | cba8933a83c2e96698b85b980438f30385f8420e (patch) | |
| tree | a419a92b1d833f8396bf1497354d5998528feac5 /modules/FindJPEG.cmake | |
| parent | e9e6c0db0f483f2cdbceb69cbb76974189e15cde (diff) | |
| download | extra-cmake-modules-cba8933a83c2e96698b85b980438f30385f8420e.tar.gz extra-cmake-modules-cba8933a83c2e96698b85b980438f30385f8420e.tar.bz2 | |
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
Diffstat (limited to 'modules/FindJPEG.cmake')
| -rw-r--r-- | modules/FindJPEG.cmake | 7 |
1 files changed, 1 insertions, 6 deletions
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) |