diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-01-28 11:08:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-01-28 11:08:27 +0000 |
| commit | 61ab813abf4d2b1d02987535c5920d0328422203 (patch) | |
| tree | d412fdbf18f184acd518870cf21939b08c8e4058 | |
| parent | ffce5ac51518bbd43ac0ae14dbb0967ae2c50bb4 (diff) | |
add boost dependency and header-finding hackery to libmspub
Change-Id: I5206cb1719164c6adc0dee46db40a8a63a45c19b
| -rw-r--r-- | libmspub/ExternalProject_libmspub.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libmspub/ExternalProject_libmspub.mk b/libmspub/ExternalProject_libmspub.mk index a971b750befa..ecd4610a2ce3 100644 --- a/libmspub/ExternalProject_libmspub.mk +++ b/libmspub/ExternalProject_libmspub.mk @@ -16,6 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,libmspub,\ )) $(eval $(call gb_ExternalProject_use_externals,libmspub,\ + boost_headers \ icu \ wpd \ wpg \ @@ -26,6 +27,7 @@ ifeq ($(OS)$(COM),WNTMSC) ifeq ($(VCVER),90) $(call gb_ExternalProject_get_state_target,libmspub,build) : cd $(EXTERNAL_WORKDIR)/build/win32 \ + && 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 ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ @@ -35,6 +37,7 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) : else ifeq ($(VCVER),100) $(call gb_ExternalProject_get_state_target,libmspub,build) : cd $(EXTERNAL_WORKDIR)/build/win32 \ + && 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 ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ @@ -44,6 +47,7 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) : else $(call gb_ExternalProject_get_state_target,libmspub,build) : cd $(EXTERNAL_WORKDIR)/build/win32 \ + && 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 ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ @@ -67,6 +71,7 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) : --without-docs \ --disable-debug \ --disable-werror \ + $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(call gb_UnpackedTarball_get_dir,boost)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \ && touch $@ |