Commit 918c5d84 authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files

Brians patch

parent c1802037

kicad/minizip/CMakeLists.txt

+5 −3
Original line number Diff line number Diff line
@@ -4,11 +4,12 @@ if(ZLIB_FOUND) 
else(ZLIB_FOUND)

    message(STATUS "Check for installed zlib -- not found")

    message(STATUS "Use wxWidgets zlib")



    # zlib is not installed, and in this case wxWidgets creates its own zlib library

    # include files are in ${wxWidgets_ROOT_DIR}/src/zlib

    # and the corresponding library is libwxzlib-<version>.a (like libwxzlib-2.8.a)

    # 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.

    find_path(ZLIB_INCLUDE_DIR

        zlib.h
@@ -19,7 +20,8 @@ else(ZLIB_FOUND) 
    find_file(

        ZLIB_LIBRARIES NAMES ${wxWidgets_LIB_DIR}/libwxzlib-2.8.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"

        )

endif(ZLIB_FOUND)