diff options
| -rw-r--r-- | Repository.mk | 1 | ||||
| -rw-r--r-- | RepositoryExternal.mk | 30 | ||||
| -rw-r--r-- | extensions/CppunitTest_extensions_test_update.mk | 3 |
3 files changed, 31 insertions, 3 deletions
diff --git a/Repository.mk b/Repository.mk index f5cd0a48be6a..2cc35445f85a 100644 --- a/Repository.mk +++ b/Repository.mk @@ -259,7 +259,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ avmediagst \ avmediawin \ collator_data \ - curl \ deployment \ deploymentgui \ dict_ja \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 3f407c432472..6be5a13ecf31 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -804,7 +804,35 @@ endef endif # !SYSTEM_LIBPNG -# MacOSX-only frameworks + +ifeq ($(SYSTEM_CURL),YES) + +define gb_LinkTarget__use_curl +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(CURL_CFLAGS) \ +) +$(call gb_LinkTarget_add_libs,$(1),$(CURL_LIBS)) + +endef + +else # !SYSTEM_CURL + +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ + curl \ +)) + +define gb_LinkTarget__use_curl +$(call gb_LinkTarget_add_linked_libs,$(1),\ + curl \ +) + +endef + +endif # SYSTEM_CURL + + +# MacOSX-only frameworks ############################################ # (in alphabetical order) define gb_LinkTarget__use_carbon diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk index b864a1518037..4184fea2bcc3 100644 --- a/extensions/CppunitTest_extensions_test_update.mk +++ b/extensions/CppunitTest_extensions_test_update.mk @@ -40,13 +40,14 @@ $(eval $(call gb_CppunitTest_add_exception_objects,extensions_test_update, \ $(eval $(call gb_CppunitTest_add_linked_libs,extensions_test_update, \ cppu \ cppuhelper \ - curl \ sal \ test \ unotest \ $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_use_external,extensions_test_update,curl)) + $(eval $(call gb_CppunitTest_set_include,extensions_test_update,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/extensions/inc) \ |