diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-01-26 21:19:13 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-01-26 22:20:06 +0100 |
| commit | a53586f4efe26b8875107d04001f4ecec760c343 (patch) | |
| tree | 9b19f0ecf5b5a08cc056e3274a2eaba96894dec8 /liborcus | |
| parent | 20773c2bb04631d9bfd60167ed091752f0deecee (diff) | |
gbuild: do not copy boost headers around
- do not use gb_UnpackedTarball_copy_header_files for boost
- adapt the optimization in concat-deps.c for new path
- use boost_headers in all LinkTargets that require it
- add explicit include paths to mysqlc, mysqlcppconn, libvisio, liborcus
Change-Id: I0c43e73ed43cc9d2e6bce8faf55e992d655a0bb9
Diffstat (limited to 'liborcus')
| -rw-r--r-- | liborcus/ExternalProject_liborcus.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index 595049ba916e..aea4c87f185f 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/liborcus/ExternalProject_liborcus.mk @@ -22,7 +22,7 @@ ifeq ($(OS)$(COM),WNTMSC) ifeq ($(VCVER),90) $(call gb_ExternalProject_get_state_target,liborcus,build) : cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static-nozip \ - && export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ && export BOOST_LIB_DIR=$(OUTDIR)/lib \ && $(COMPATH)/vcpackages/vcbuild.exe liborcus-static-nozip.vcproj "Release|Win32" \ @@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : else ifeq ($(VCVER),100) $(call gb_ExternalProject_get_state_target,liborcus,build) : cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static-nozip \ - && export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ && export BOOST_LIB_DIR=$(OUTDIR)/lib \ && MSBuild.exe liborcus-static-nozip.vcxproj /p:Configuration=Release /p:OutDir=Release/ /p:TargetName=orcus /p:WholeProgramOptimization=no \ @@ -38,7 +38,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : else $(call gb_ExternalProject_get_state_target,liborcus,build) : cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static-nozip \ - && export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ && export BOOST_LIB_DIR=$(OUTDIR)/lib \ && MSBuild.exe liborcus-static-nozip.vcxproj /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 /p:Configuration=Release /p:OutDir=Release/ /p:TargetName=orcus /p:WholeProgramOptimization=no \ @@ -60,7 +60,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : --disable-spreadsheet-model \ --disable-werror \ $(if $(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS)),$(if $(gb_ENABLE_DBGUTIL),CPPFLAGS=-D_GLIBCXX_DEBUG)) \ - $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(OUTDIR)/inc/external) \ + $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(call gb_UnpackedTarball_get_dir,boost)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ && touch $@ |