diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-02-05 17:19:11 -0500 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-02-07 22:33:16 +0000 |
| commit | b9d6c7a48cbe3573a2010811d8671d3e5ff30e2a (patch) | |
| tree | b08989fd5eeb63691f914e8b393d80151588c0f7 /libvisio | |
| parent | 7e2f34a3172a756a0fd70cae1294250206945a6e (diff) | |
convert libxml2 to gbuild and add to tail_build
Change-Id: Ie6ae2150e1f011e17034abcace18c5967b4dacf5
Reviewed-on: https://gerrit.libreoffice.org/2023
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Peter Foley <pefoley2@verizon.net>
Diffstat (limited to 'libvisio')
| -rw-r--r-- | libvisio/ExternalProject_libvisio.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libvisio/ExternalProject_libvisio.mk b/libvisio/ExternalProject_libvisio.mk index 94f1b1d3ce9b..c133158d343f 100644 --- a/libvisio/ExternalProject_libvisio.mk +++ b/libvisio/ExternalProject_libvisio.mk @@ -19,6 +19,7 @@ $(eval $(call gb_ExternalProject_use_externals,libvisio,\ boost_headers \ wpd \ wpg \ + libxml2 \ )) ifeq ($(OS)$(COM),WNTMSC) @@ -29,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) : && export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && export LIBXML_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export LIBXML_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,xml2)/include \ && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ && $(COMPATH)/vcpackages/vcbuild.exe libvisio.vcproj "Release|Win32" \ && touch $@ @@ -39,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) : && export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && export LIBXML_INCLUDE_DIR=$(OUTDIR)/inc/extrenal \ + && export LIBXML_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,xml2)/include \ && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ && msbuild.exe libvisio.vcxproj /p:Configuration=Release \ && touch $@ @@ -49,7 +50,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) : && export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && export LIBXML_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export LIBXML_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,xml2)/include \ && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ && msbuild.exe libvisio.vcxproj /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 /p:Configuration=Release \ && touch $@ @@ -67,7 +68,8 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) : --without-docs \ --disable-debug \ --disable-werror \ - $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(call gb_UnpackedTarball_get_dir,boost)) \ + CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost)) \ + $(if $(filter NO,$(SYSTEM_LIBXML)),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \ && touch $@ |