haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update FindZLIB.cmake to version 2.6.1 + add MSYS path.

This commit is contained in:
f3nix 2008-09-07 20:54:17 +00:00
parent 422ffdabc1
commit 51c0f04a56
1 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
CMakeModules/FindZLIB.cmake
View File

@ -1,3 +1,7 @@
#
# From CMake 2.6.1 + some path changes
#
# - Find zlib # - Find zlib
# Find the native ZLIB includes and library # Find the native ZLIB includes and library
# #
@ -16,38 +20,20 @@ IF (ZLIB_INCLUDE_DIR)
SET(ZLIB_FIND_QUIETLY TRUE) SET(ZLIB_FIND_QUIETLY TRUE)
ENDIF (ZLIB_INCLUDE_DIR) ENDIF (ZLIB_INCLUDE_DIR)
FIND_PATH(ZLIB_INCLUDE_DIR zlib.h FIND_PATH(ZLIB_INCLUDE_DIR zlib.h PATHS ${ZLIB_DIR_SEARCH}/local/include)
/usr/local/include
/usr/include
${ZLIB_DIR_SEARCH}/local/include
)
SET(ZLIB_NAMES z zlib zdll) SET(ZLIB_NAMES z zlib zdll)
FIND_LIBRARY(ZLIB_LIBRARY FIND_LIBRARY(ZLIB_LIBRARY NAMES ${ZLIB_NAMES} PATHS ${ZLIB_DIR_SEARCH}/local/lib)
NAMES ${ZLIB_NAMES}
PATHS /usr/lib /usr/local/lib ${ZLIB_DIR_SEARCH}/local/lib
)
IF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) # handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if
SET(ZLIB_FOUND TRUE) # all listed variables are TRUE
SET( ZLIB_LIBRARIES ${ZLIB_LIBRARY} ) INCLUDE(FindPackageHandleStandardArgs)
ELSE (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB DEFAULT_MSG ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
SET(ZLIB_FOUND FALSE)
SET( ZLIB_LIBRARIES )
ENDIF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)
IF(ZLIB_FOUND) IF(ZLIB_FOUND)
IF (NOT ZLIB_FIND_QUIETLY) SET( ZLIB_LIBRARIES ${ZLIB_LIBRARY} )
MESSAGE(STATUS "Found ZLIB: ${ZLIB_LIBRARY}")
ENDIF (NOT ZLIB_FIND_QUIETLY)
ELSE(ZLIB_FOUND) ELSE(ZLIB_FOUND)
IF (ZLIB_FIND_REQUIRED) SET( ZLIB_LIBRARIES )
MESSAGE(STATUS "Looked for Z libraries named ${ZLIBS_NAMES}.")
MESSAGE(FATAL_ERROR "Could NOT find z library")
ENDIF (ZLIB_FIND_REQUIRED)
ENDIF(ZLIB_FOUND) ENDIF(ZLIB_FOUND)
MARK_AS_ADVANCED( MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
ZLIB_LIBRARY
ZLIB_INCLUDE_DIR
)