From 918c5d84a46937ce688a99fe38f5261e2cfc0338 Mon Sep 17 00:00:00 2001 From: Dick Hollenbeck Date: Sat, 18 Jun 2011 09:52:18 -0500 Subject: [PATCH] Brians patch --- kicad/minizip/CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/kicad/minizip/CMakeLists.txt b/kicad/minizip/CMakeLists.txt index 764feb25fc..601c468123 100644 --- a/kicad/minizip/CMakeLists.txt +++ b/kicad/minizip/CMakeLists.txt @@ -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-.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 @@ -16,10 +17,11 @@ else(ZLIB_FOUND) 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.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)