This is an automated email from the ASF dual-hosted git repository.
bneradt pushed a commit to branch dev-1-0-14
in repository https://gitbox.apache.org/repos/asf/trafficserver-libswoc.git
commit 4d0ffa704ff19d6f4b856a1312b87df4832f089c
Author: Alan M. Carroll <a...@apache.org>
AuthorDate: Mon Mar 2 07:59:42 2020 -0600
Add "headers" part.
---
swoc++/swoc++-headers.part | 6 ++++++
swoc++/swoc++-shared.part | 2 ++
swoc++/swoc++-static.part | 2 ++
swoc++/swoc++.part | 15 +++------------
4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/swoc++/swoc++-headers.part b/swoc++/swoc++-headers.part
new file mode 100644
index 0000000..b0cd428
--- /dev/null
+++ b/swoc++/swoc++-headers.part
@@ -0,0 +1,6 @@
+Import("*")
+PartName("headers")
+
+# export the include directory
+inc_files = Pattern(src_dir="include/swoc", includes=["*.h"])
+env.InstallInclude(inc_files)
diff --git a/swoc++/swoc++-shared.part b/swoc++/swoc++-shared.part
index df0b7d3..7d52392 100644
--- a/swoc++/swoc++-shared.part
+++ b/swoc++/swoc++-shared.part
@@ -1,6 +1,8 @@
Import("*")
PartName("shared")
+DependsOn([ Component("libswoc.headers") ])
+
src_files = env.get("src_files")
env.AppendUnique(
diff --git a/swoc++/swoc++-static.part b/swoc++/swoc++-static.part
index e7defe3..02b1759 100644
--- a/swoc++/swoc++-static.part
+++ b/swoc++/swoc++-static.part
@@ -1,6 +1,8 @@
Import("*")
PartName("static")
+DependsOn([ Component("libswoc.headers") ])
+
src_files = env.get("src_files")
env.AppendUnique(
diff --git a/swoc++/swoc++.part b/swoc++/swoc++.part
index 4c4df61..83c9d5d 100644
--- a/swoc++/swoc++.part
+++ b/swoc++/swoc++.part
@@ -14,15 +14,6 @@ src_files = [
"src/TextView.cc",
]
-# export the include directory
-inc_files = Pattern(src_dir="include/swoc", includes=["*.h"])
-#env.InstallInclude(env.get("inc_files"))
-env.InstallInclude(inc_files)
-
-env.AppendUnique(
- CCFLAGS=['-std=c++17' ],
- CPPPATH=["include"],
-)
-
-env.Part("swoc++-static.part", package_group="libswoc", src_files=src_files,
inc_files=inc_files)
-env.Part("swoc++-shared.part", package_group="libswoc", src_files=src_files,
inc_files=inc_files)
+env.Part("swoc++-static.part", package_group="libswoc", src_files=src_files)
+env.Part("swoc++-shared.part", package_group="libswoc", src_files=src_files)
+env.Part("swoc++-headers.part", package_group="libswoc")
