You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
67 lines
1.5 KiB
67 lines
1.5 KiB
From d72a33c6aed0ca8f9fe0b90bc6d72e7313985524 Mon Sep 17 00:00:00 2001
|
|
From: David Tardon <dtardon@redhat.com>
|
|
Date: Tue, 8 Mar 2016 05:57:40 +0100
|
|
Subject: [PATCH 1/4] reorder
|
|
|
|
Change-Id: I8ff9f61475fddb475fe08e867c5446c825abb7dc
|
|
---
|
|
RepositoryExternal.mk | 31 ++++++++++++++++---------------
|
|
1 file changed, 16 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
|
|
index c6fe371..c8aab64 100644
|
|
--- a/RepositoryExternal.mk
|
|
+++ b/RepositoryExternal.mk
|
|
@@ -704,6 +704,21 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
|
|
|
|
endef
|
|
|
|
+define gb_LinkTarget__use_boost_filesystem
|
|
+$(call gb_LinkTarget_add_defs,$(1),\
|
|
+ -DBOOST_ALL_NO_LIB \
|
|
+)
|
|
+
|
|
+$(call gb_LinkTarget_use_static_libraries,$(1),\
|
|
+ boost_filesystem \
|
|
+)
|
|
+
|
|
+endef
|
|
+
|
|
+define gb_ExternalProject__use_boost_filesystem
|
|
+$(call gb_ExternalProject_use_static_libraries,$(1),boost_filesystem)
|
|
+endef
|
|
+
|
|
define gb_LinkTarget__use_boost_iostreams
|
|
$(call gb_LinkTarget_add_defs,$(1),\
|
|
-DBOOST_ALL_NO_LIB \
|
|
@@ -743,25 +758,11 @@ $(call gb_LinkTarget_set_include,$(1),\
|
|
|
|
endef
|
|
|
|
-define gb_LinkTarget__use_boost_filesystem
|
|
-$(call gb_LinkTarget_add_defs,$(1),\
|
|
- -DBOOST_ALL_NO_LIB \
|
|
-)
|
|
-
|
|
-$(call gb_LinkTarget_use_static_libraries,$(1),\
|
|
- boost_filesystem \
|
|
-)
|
|
-
|
|
-endef
|
|
-
|
|
-define gb_ExternalProject__use_boost_filesystem
|
|
-$(call gb_ExternalProject_use_static_libraries,$(1),boost_filesystem)
|
|
-endef
|
|
-
|
|
define gb_ExternalProject__use_boost_headers
|
|
$(call gb_ExternalProject_use_unpacked,$(1),boost)
|
|
|
|
endef
|
|
+
|
|
endif # SYSTEM_BOOST
|
|
|
|
|
|
--
|
|
2.5.0
|
|
|