kicad-developers team mailing list archive

[Dick Hollenbeck <dick@xxxxxxxxxxx>]

> Hey, no problem.
>
> Please find attached a patch to save the grid origin to the board file.
>
> There is also a line in the patch to modify the search list for zlib
> which fails under windows. Using static libraries, wxWidgets creates
> gcc_lib and not gcc_dll.
>
> Feel free to apply the patch without the cmake adjustment, or perhaps
> Wayne could quickly OK the cmake bit before the commit.
>
> Best Regards,
>
> Brian.

Origin portion committed.

remaining CMakeLists.txt portion attached for Wayne's review.

Dick

--- kicad/minizip/CMakeLists.txt	2010-09-18 17:55:08 +0000
+++ kicad/minizip/CMakeLists.txt	2010-12-18 19:57:34 +0000
@@ -11,7 +11,7 @@
     # Unfortunately, we have no way to know exactlty the path of zlib.h becuase this file
     # is in wxWidgets sources, not in wxWidgets include path.
     find_path(ZLIB_INCLUDE_DIR zlib.h PATHS ${wxWidgets_ROOT_DIR}/../src/zlib/ ${wxWidgets_ROOT_DIR}/src/zlib/ DOC "location of zlib include files")
-	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 DOC "location of wxzlib library 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 gcc_lib DOC "location of wxzlib library file")
 endif(ZLIB_FOUND)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}