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

an ugly fix to build minizip under windows( ugly, but it works for me) 

If anyone can refine this, it is welcomed (see minizip/CMakeLists.txt for comments)
This commit is contained in:
CHARRAS 2008-01-29 20:34:34 +00:00
parent 67ebe29b60
commit b21b75aecc
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kicad/minizip/CMakeLists.txt
View File

@ -4,8 +4,14 @@ 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")
IF (NOT MINGW) IF (NOT MINGW)
MESSAGE(FATAL_ERROR MESSAGE(FATAL_ERROR
"zlib was not found - it is required to build KiCad") "zlib was not found - it is required to build KiCad")
ELSE (NOT MINGW)
# 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
INCLUDE_DIRECTORIES(${wxWidgets_ROOT_DIR}/src/zlib)
ENDIF (NOT MINGW) ENDIF (NOT MINGW)
ENDIF(ZLIB_FOUND) ENDIF(ZLIB_FOUND)
@ -16,6 +22,6 @@ SET(MINIZIP_SRCS
ADD_EXECUTABLE(minizip ${MINIZIP_SRCS} ) ADD_EXECUTABLE(minizip ${MINIZIP_SRCS} )
TARGET_LINK_LIBRARIES(minizip ${ZLIB_LIBRARIES}) TARGET_LINK_LIBRARIES(minizip ${ZLIB_LIBRARIES} ${wxWidgets_LIBRARIES})
INSTALL(TARGETS minizip RUNTIME DESTINATION bin COMPONENT binary) INSTALL(TARGETS minizip RUNTIME DESTINATION bin COMPONENT binary)