diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-01-28 10:13:50 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-02-18 17:08:04 +0000 |
| commit | 7ae175f5e818100fe6aecaecc8da7701c05c6a6b (patch) | |
| tree | 6b0421bf4d1bed5882387bfd7884bf235c46ed8c /libvisio | |
| parent | 1825f33008c06f4f7a0b79771b1638b0de2af7e2 (diff) | |
Upload libmspub 0.0.4
Change-Id: Icb47740815fabff2338196ec194a51a23f7adadd
(cherry picked from commit 093a5c95a3724eb4795713c5cb4472611ca22324)
add boost dependency and header-finding hackery to libmspub
Change-Id: I5206cb1719164c6adc0dee46db40a8a63a45c19b
(cherry picked from commit 61ab813abf4d2b1d02987535c5920d0328422203)
Fix internal boost variables
Change-Id: Id0011bf9b40cfaf02887edf6fdbee9cf51cefc86
Use the BOOST_INCLUDE_DIR variable in Windows build
(cherry picked from commit a8fd6b51e96999bea19904f183ccb2bf847c5e4f)
Conflicts:
libmspub/ExternalProject_libmspub.mk
Change-Id: I2f86aea9177f2f3d24aea40c47d530fd7d96d21c
Silence some warnings
(cherry picked from commit 6d850419434c5df8cfdcd7682d49bc3d92b8de83)
Conflicts:
libmspub/ExternalProject_libmspub.mk
Change-Id: I5a644fbe698b31bded3a5bf0fc96f1bf2be415e2
Update the internal libmspub to 0.0.5
Change-Id: Ia1e2807a9f8d624e734afa93102fb6ff27eee091
(cherry picked from commit ede5fccc348986528d52149426d344f880790637)
Reviewed-on: https://gerrit.libreoffice.org/2234
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
Diffstat (limited to 'libvisio')
| -rw-r--r-- | libvisio/ExternalProject_libvisio.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libvisio/ExternalProject_libvisio.mk b/libvisio/ExternalProject_libvisio.mk index 191a712b90a5..38627990d270 100644 --- a/libvisio/ExternalProject_libvisio.mk +++ b/libvisio/ExternalProject_libvisio.mk @@ -26,6 +26,7 @@ ifeq ($(OS)$(COM),WNTMSC) ifeq ($(VCVER),90) $(call gb_ExternalProject_get_state_target,libvisio,build) : cd $(EXTERNAL_WORKDIR)/build/win32 \ + && export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export LIBXML_INCLUDE_DIR=$(OUTDIR)/inc/external \ @@ -35,6 +36,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) : else ifeq ($(VCVER),100) $(call gb_ExternalProject_get_state_target,libvisio,build) : cd $(EXTERNAL_WORKDIR)/build/win32 \ + && export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export LIBXML_INCLUDE_DIR=$(OUTDIR)/inc/extrenal \ @@ -44,6 +46,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) : else $(call gb_ExternalProject_get_state_target,libvisio,build) : cd $(EXTERNAL_WORKDIR)/build/win32 \ + && export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export LIBXML_INCLUDE_DIR=$(OUTDIR)/inc/external \ |