Merge lp:~qcumber-some/widelands/minizip into lp:widelands

[Jens Beyer]

Try to detect Minizip library, if found use this one, if not, issue a warning in CMake run and include the widelands shipped ones (no source changes there).

[Jens Beyer (qcumber-some)]

I updated this branch from trunk to get rid of the conflicts.
Please re-evaluate :-)

review: Needs Resubmitting

[Jens Beyer (qcumber-some)]

Gentoo now bundles zlib-1.2.5 with minizip library, so this might als be validated by someone with a stable Gentoo system :-)

[Peter Waller (peter.waller)]

As requested, tested working ingame with zlib-1.2.5 on an x86_64 Gentoo system, with and without minizip enabled.

I get the warning when minizip is disabled, as expected.

[SirVer (sirver)]

Jens, can we not go ahead and merge this now?

[Jens Beyer (qcumber-some)]

Well...
It works on my system (Gentoo 32bit with zlib-1.2.6), and it works on Peter's system (Gentoo 64bit with zlib-1.2.5) with and without minizip. Nobody else mentioned if it works or not.

I'm not sure if that's enough for a merge...

We could merge this and wait for bugs stating "I have minizip installed but CMake says I don't". Not finding minizip will result in a statically linked minizip library out of the same sources we used up to now, so this should be pretty harmless...

Your choice :-)

[SirVer (sirver)]

>Your choice :-)
I'd say, merge and wait for crying people to complain ;). Could you do
it?

[Jens Beyer (qcumber-some)]

Merged.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-05-05 11:32:38 +0000
+++ CMakeLists.txt	2012-05-05 19:52:19 +0000
@@ -391,6 +391,12 @@
 find_package(ZLIB REQUIRED)
 include_directories(${ZLIB_INCLUDE_DIR})
 
+# Check if we have a working minizip library
+find_package(Minizip)
+if (MINIZIP_FOUND)
+  include_directories(${MINIZIP_INCLUDE_DIR})
+endif (MINIZIP_FOUND)
+
 if (APPLE OR WIN32)
   find_package(intl REQUIRED)
   include_directories(${INTL_INCLUDE_DIR})

=== added file 'cmake/Modules/FindMinizip.cmake'
--- cmake/Modules/FindMinizip.cmake	1970-01-01 00:00:00 +0000
+++ cmake/Modules/FindMinizip.cmake	2012-05-05 19:52:19 +0000
@@ -0,0 +1,37 @@
+# - Try to find Minizip
+# Once done this will define
+#  
+#  MINIZIP_FOUND        - system has MINIZIP
+#  MINIZIP_INCLUDE_DIR  - the MINIZIP include directory
+#  MINIZIP_LIBRARY_DIR  - where the libraries are
+#  MINIZIP_LIBRARY      - Link these to use MINIZIP
+#   
+
+IF (MINIZIP_INCLUDE_DIR)
+  # Already in cache, be silent
+  SET(MINIZIP_FIND_QUIETLY TRUE)
+ENDIF (MINIZIP_INCLUDE_DIR)
+
+FIND_PATH( MINIZIP_INCLUDE_DIR 
+	  NAMES zip.h unzip.h ioapi.h
+	  PATHS /usr/local/include /usr/include
+	  PATH_SUFFIXES minizip/ )
+SET( MINIZIP_NAMES minizip MINIZIP )
+FIND_LIBRARY( MINIZIP_LIBRARY
+	      NAMES ${MINIZIP_NAMES}
+	      PATHS /usr/lib /usr/local/lib )
+
+GET_FILENAME_COMPONENT( MINIZIP_LIBRARY_DIR ${MINIZIP_LIBRARY} PATH )
+
+IF (MINIZIP_INCLUDE_DIR AND MINIZIP_LIBRARY)
+   SET(MINIZIP_FOUND TRUE)
+   SET(MINIZIP_LIBRARY_DIR ${MINIZIP_LIBRARY} )
+   IF (NOT MINIZIP_FIND_QUIETLY)
+     MESSAGE (STATUS "Found Minizip: ${MINIZIP_LIBRARY} ${MINIZIP_INCLUDE_DIR}")
+   ENDIF (NOT MINIZIP_FIND_QUIETLY)
+ELSE (MINIZIP_INCLUDE_DIR AND MINIZIP_LIBRARY)
+   SET( MINIZIP_FOUND FALSE )
+   SET( MINIZIP_LIBRARY_DIR )
+   SET( MINIZIP_EXTRA_DEFINITIONS )
+ENDIF (MINIZIP_INCLUDE_DIR AND MINIZIP_LIBRARY)
+

=== modified file 'src/CMakeLists.txt' (properties changed: +x to -x)
--- src/CMakeLists.txt	2012-05-05 11:31:13 +0000
+++ src/CMakeLists.txt	2012-05-05 19:52:19 +0000
@@ -98,6 +98,11 @@
   add_subdirectory(scripting)
 endif (WL_UNIT_TESTS)
 
+if (NOT MINIZIP_FOUND)
+  add_subdirectory(minizip)
+  target_link_libraries(widelands_all wl_minizip)
+endif (NOT MINIZIP_FOUND)
+
 target_link_libraries(widelands_all ${SDLIMAGE_LIBRARY})
 target_link_libraries(widelands_all ${SDLMIXER_LIBRARY})
 target_link_libraries(widelands_all ${SDLNET_LIBRARY})
@@ -109,6 +114,9 @@
 target_link_libraries(widelands_all ${OPENGL_gl_LIBRARY})
 target_link_libraries(widelands_all ${GLEW_LIBRARY})
 target_link_libraries(widelands_all ${Boost_SIGNALS_LIBRARY})
+if (MINIZIP_FOUND)
+  target_link_libraries(widelands_all ${MINIZIP_LIBRARY})
+endif (MINIZIP_FOUND)
 if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
   target_link_libraries(widelands_all ${EXECINFO_LIBRARY})
 endif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "OpenBSD")

=== modified file 'src/io/filesystem/zip_filesystem.h'
--- src/io/filesystem/zip_filesystem.h	2012-04-28 17:43:58 +0000
+++ src/io/filesystem/zip_filesystem.h	2012-05-05 19:52:19 +0000
@@ -21,8 +21,8 @@
 #define ZIP_FILESYSTEM_H
 
 #include "filesystem.h"
-#include "unzip.h"
-#include "zip.h"
+#include <minizip/unzip.h>
+#include <minizip/zip.h>
 
 #include <string>
 #include <cstring>

=== added directory 'src/minizip'
=== added file 'src/minizip/CMakeLists.txt'
--- src/minizip/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/minizip/CMakeLists.txt	2012-05-05 19:52:19 +0000
@@ -0,0 +1,3 @@
+add_library(wl_minizip STATIC EXCLUDE_FROM_ALL "unzip.cc")
+
+message(WARNING "You are using widelands-bundled minizip sources. Please install your distribution's minizip library or urge your distribution maintainer to include the minizip library in your package repository. Thank you.")

=== added file 'src/minizip/README.txt'
--- src/minizip/README.txt	1970-01-01 00:00:00 +0000
+++ src/minizip/README.txt	2012-05-05 19:52:19 +0000
@@ -0,0 +1,5 @@
+The files in this directory are either original or derived sources from zlib's minizip examples.
+
+The sources are only included in Widelands if you don't have Minizip installed.
+Please install your distribution's minizip library or urge your distribution maintainer 
+to include the minizip library in your package repository. Thank you.

=== renamed file 'src/io/filesystem/ioapi.h' => 'src/minizip/ioapi.h'
=== renamed file 'src/io/filesystem/unzip.cc' => 'src/minizip/unzip.cc'
=== renamed file 'src/io/filesystem/unzip.h' => 'src/minizip/unzip.h'
=== renamed file 'src/io/filesystem/zip.h' => 'src/minizip/zip.h'