Kaydet (Commit) 604bdac5 authored tarafından David Tardon's avatar David Tardon

gbuild: allow to depend on headers of a library

... even if we do not link with it. This was previously solved by
delivering the headers to solver and depending on the Package.

Change-Id: Id1b53b88d54226cb3ce02f5f2424632596fa069a
üst 28abf5db
...@@ -260,6 +260,7 @@ $(eval $(foreach method,\ ...@@ -260,6 +260,7 @@ $(eval $(foreach method,\
use_package \ use_package \
use_packages \ use_packages \
use_unpacked \ use_unpacked \
use_headers \
add_package_headers \ add_package_headers \
add_sdi_headers \ add_sdi_headers \
set_precompiled_header \ set_precompiled_header \
......
...@@ -1371,6 +1371,17 @@ $(call gb_LinkTarget_get_external_headers_target,$(1)) :| $(call gb_ExternalProj ...@@ -1371,6 +1371,17 @@ $(call gb_LinkTarget_get_external_headers_target,$(1)) :| $(call gb_ExternalProj
endef endef
# Use headers provided by another link target.
#
# This function should only be needed to enforce correct build ordering,
# if the link target does not use the other link target.
#
# gb_LinkTarget_use_headers linktarget other-linktarget(s)
define gb_LinkTarget_use_headers
$(call gb_LinkTarget_get_external_headers_target,$(1)) :\
$(foreach linktarget,$(2),$(call gb_LinkTarget_get_headers_target,$(linktarget)))
endef
# this forwards to functions that must be defined in RepositoryExternal.mk. # this forwards to functions that must be defined in RepositoryExternal.mk.
# $(eval $(call gb_LinkTarget_use_external,library,external)) # $(eval $(call gb_LinkTarget_use_external,library,external))
......
...@@ -378,6 +378,10 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\ ...@@ -378,6 +378,10 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
$(eval $(call gb_Library_use_headers,svxcore,\
dbtools \
))
$(eval $(call gb_Library_add_exception_objects,svxcore,\ $(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/fmcomp/dbaexchange \ svx/source/fmcomp/dbaexchange \
svx/source/fmcomp/fmgridcl \ svx/source/fmcomp/fmgridcl \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment