Add helpful message for QT Windows users

Add FindZLib in new format
Move FindJPEG and FINDWGET over to new scheme
This commit is contained in:
Ian Scott 2002-09-02 12:05:40 -04:00
parent 63d64d5780
commit 5f60153d2f
4 changed files with 62 additions and 6 deletions

View File

@ -1,14 +1,31 @@
#
# Find the native JPEG includes and library
#
# This module defines
# JPEG_INCLUDE_DIR, where to find jpeglib.h, etc.
# JPEG_LIBRARIES, the libraries to link against to use JPEG.
# JPEG_FOUND, If false, do try to use JPEG.
# also defined, but not for general use are
# JPEG_LIBRARY, where to find the JPEG library.
FIND_PATH(NATIVE_JPEG_INCLUDE_PATH jpeglib.h
FIND_PATH(JPEG_INCLUDE_DIR jpeglib.h
/usr/local/include
/usr/include
)
FIND_LIBRARY(NATIVE_JPEG_LIB_PATH jpeg
PATHS /usr/lib /usr/local/lib
FIND_LIBRARY(JPEG_LIBRARY jpeg
/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)
# Deprecated declarations.
SET (NATIVE_JPEG_INCLUDE_PATH ${JPEG_INCLUDE_DIR} )
GET_FILENAME_COMPONENT (NATIVE_JPEG_LIB_PATH ${JPEG_LIBRARY} PATH)

View File

@ -53,7 +53,9 @@ IF (WIN32)
${QTDIR}/lib C:/Progra~1/qt/lib )
FIND_LIBRARY(QT_QTMAIN_LIBRARY qtmain
${QTDIR}/lib C:/Progra~1/qt/lib )
${QTDIR}/lib C:/Progra~1/qt/lib
DOC "This Library is only needed by and included with Qt3 on MSWindows. It should be NOTFOUND, undefined or IGNORE otherwise."
)
FIND_FILE(QT_MOC_EXECUTABLE moc.exe
${QTDIR}/bin C:/Progra~1/qt/bin

View File

@ -1,14 +1,28 @@
#
# this module looks for wget
#
# This module defines the following values
# WGET_EXECUTABLE: This variable defines the full path to the wget tool.
# WGET_FOUND: True if wget has been found.
INCLUDE(${CMAKE_ROOT}/Modules/FindCygwin.cmake)
FIND_PROGRAM(WGET
FIND_PROGRAM(WGET_EXECUTABLE
wget
${CYGWIN_INSTALL_PATH}/bin
)
IF (WGET_EXECUTABLE)
SET(WGET_FOUND "Yes")
ELSE (WGET_EXECUTABLE)
SET(WGET_FOUND "No")
ENDIF (WGET_EXECUTABLE)
MARK_AS_ADVANCED(
WGET
WGET_EXECUTABLE
)
# WGET option is deprecated.
# use WGET_EXECUTABLE instead.
SET (WGET ${WGET_EXECUTABLE} )

23
Modules/FindZLib.cmake Normal file
View File

@ -0,0 +1,23 @@
#
# Find the native ZLIB includes and library
#
# ZLIB_INCLUDE_DIR - where to find zlib.h, etc.
# ZLIB_LIBRARIES - List of fully qualified libraries to link against when using zlib.
# ZLIB_FOUND - Do not attempt to use zlib if "no" or undefined.
FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
/usr/local/include
/usr/include
)
FIND_LIBRARY(ZLIB_LIBRARY z
/usr/lib
/usr/local/lib
)
IF(ZLIB_INCLUDE_DIR)
IF(ZLIB_LIBRARY)
SET( ZLIB_LIBRARIES ${ZLIB_LIBRARY} )
SET( ZLIB_FOUND "YES" )
ENDIF(ZLIB_LIBRARIES)
ENDIF(ZLIB_INCLUDE_DIR)