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

Brians patch

This commit is contained in:
Dick Hollenbeck 2011-06-18 09:52:18 -05:00
parent c18020374b
commit 918c5d84a4
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kicad/minizip/CMakeLists.txt
View File

@ -4,11 +4,12 @@ if(ZLIB_FOUND)
else(ZLIB_FOUND) else(ZLIB_FOUND)
message(STATUS "Check for installed zlib -- not found") message(STATUS "Check for installed zlib -- not found")
message(STATUS "Use wxWidgets zlib") message(STATUS "Use wxWidgets zlib")
# zlib is not installed, and in this case wxWidgets creates its own zlib library # zlib is not installed, and in this case wxWidgets creates its own zlib library
# include files are in ${wxWidgets_ROOT_DIR}/src/zlib # include files are in ${wxWidgets_ROOT_DIR}/src/zlib
# and the corresponding library is libwxzlib-<version>.a (like libwxzlib-2.8.a) # and the corresponding library is libwxzlib-<version>.a (like libwxzlib-2.8.a)
# and we try to use it # and we try to use it
# Unfortunately, we have no way to know exactlty the path of zlib.h because this file # Unfortunately, we have no way to know exactly the path of zlib.h because this file
# is in wxWidgets sources, not in wxWidgets include path. # is in wxWidgets sources, not in wxWidgets include path.
find_path(ZLIB_INCLUDE_DIR find_path(ZLIB_INCLUDE_DIR
zlib.h zlib.h
@ -16,10 +17,11 @@ else(ZLIB_FOUND)
DOC "location of zlib include files" DOC "location of zlib include files"
) )
find_file( find_file(
ZLIB_LIBRARIES NAMES ${wxWidgets_LIB_DIR}/libwxzlib-2.8.a ZLIB_LIBRARIES NAMES ${wxWidgets_LIB_DIR}/libwxzlib-2.8.a
ZLIB_LIBRARIES NAMES ${wxWidgets_LIB_DIR}/libwxzlib-2.9.a libwxzlib.a ZLIB_LIBRARIES NAMES ${wxWidgets_LIB_DIR}/libwxzlib-2.9.a libwxzlib.a
PATHS ${wxWidgets_ROOT_DIR}/lib/ PATH_SUFFIXES gcc_dll PATHS ${wxWidgets_ROOT_DIR}/lib/
PATH_SUFFIXES gcc_lib gcc_dll
DOC "location of wxzlib library file" DOC "location of wxzlib library file"
) )
endif(ZLIB_FOUND) endif(ZLIB_FOUND)