[Libreoffice-commits] core.git: libcdr/ExternalProject_libcdr.mk libvisio/ExternalProject_libvisio.mk RepositoryExternal.mk

[Fridrich Å trba]

 RepositoryExternal.mk                |    8 ++++++++
 libcdr/ExternalProject_libcdr.mk     |    1 +
 libvisio/ExternalProject_libvisio.mk |    1 +
 3 files changed, 10 insertions(+)

New commits:
commit 2f4d160bd6f4730c1597c11757efffc4173a17bf
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Mar 14 12:45:24 2013 +0100

    Libcdr and libvisio need zlib
    
    Change-Id: Ie48c7305e7acca17d3c488a76e8fc47984c51679

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6a15af5..a7042b1 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -298,6 +298,8 @@ define gb_LinkTarget__use_zlib_x64
 
 endef
 
+gb_ExternalProject__use_zlib :=
+
 else # !SYSTEM_ZLIB
 
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
@@ -333,6 +335,12 @@ $(call gb_LinkTarget__use_zlib_multiarch,$(1),zlib_x64)
 
 endef
 
+define gb_ExternalProject__use_zlib
+$(call gb_ExternalProject_use_package,$(1),zlib_inc)
+$(call gb_ExternalProject_use_static_libraries,$(1),zlib)
+
+endef
+
 endif # SYSTEM_ZLIB
 
 
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index 9bd0cea..431b9b4 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_ExternalProject_use_externals,libcdr,\
 	lcms2 \
 	wpd \
 	wpg \
+	zlib \
 ))
 
 ifeq ($(OS)$(COM),WNTMSC)
diff --git a/libvisio/ExternalProject_libvisio.mk b/libvisio/ExternalProject_libvisio.mk
index 2095e61..30cffae 100644
--- a/libvisio/ExternalProject_libvisio.mk
+++ b/libvisio/ExternalProject_libvisio.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_ExternalProject_use_externals,libvisio,\
 	wpd \
 	wpg \
 	libxml2 \
+	zlib \
 ))
 
 $(call gb_ExternalProject_get_state_target,libvisio,build) :