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 1cee009b8beceefa6726f46ebca6421ac659e494 Author: Alan M. Carroll <[email protected]> AuthorDate: Fri Feb 28 15:44:05 2020 -0600 Build fixes. --- swoc++/libswoc++-static.pc.in | 11 +++++++++++ swoc++/swoc++-shared.part | 4 ++-- swoc++/swoc++-static.part | 4 ++-- swoc++/swoc++.part | 12 +++++------- unit_tests/unit_tests.part | 2 +- 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/swoc++/libswoc++-static.pc.in b/swoc++/libswoc++-static.pc.in new file mode 100644 index 0000000..9a78d45 --- /dev/null +++ b/swoc++/libswoc++-static.pc.in @@ -0,0 +1,11 @@ +prefix=pkg_prefix +exec_prefix=${prefix} +includedir=${prefix}/include +libdir=${exec_prefix}/lib + +Name: LibSWOC++ +Description: A collection of solid C++ utilities and classes. +Version: pkg_version +Requires: +Libs: -L${libdir} -lswoc++ +Cflags: -I${includedir} diff --git a/swoc++/swoc++-shared.part b/swoc++/swoc++-shared.part index d83c08b..4b5ddfb 100644 --- a/swoc++/swoc++-shared.part +++ b/swoc++/swoc++-shared.part @@ -1,17 +1,17 @@ Import("*") PartName("shared") -PartVersion("1.0.14") src_files = env.get("src_files") env.AppendUnique( CCFLAGS=['-std=c++17' ], - CPPPATH=["include"], + CPPPATH=['include'], ) # build the library out = env.SharedLibrary("libswoc++", src_files) env.InstallLib(out) +env.InstallInclude(env.get("inc_files")) # Export the package config. pc_file = env.Substfile("libswoc++.pc", "libswoc++.pc.in" diff --git a/swoc++/swoc++-static.part b/swoc++/swoc++-static.part index 0d1a455..62b38ba 100644 --- a/swoc++/swoc++-static.part +++ b/swoc++/swoc++-static.part @@ -1,17 +1,17 @@ Import("*") PartName("static") -PartVersion("1.0.14") src_files = env.get("src_files") env.AppendUnique( CCFLAGS=['-std=c++17' ], - CPPPATH=["include"], + CPPPATH=['include'], ) # build the library out = env.StaticLibrary("libswoc++", src_files) env.InstallLib(out) +env.InstallInclude(env.get("inc_files")) # Export the package config. pc_file = env.Substfile("libswoc++-static.pc", "libswoc++-static.pc.in" diff --git a/swoc++/swoc++.part b/swoc++/swoc++.part index a881991..19013cb 100644 --- a/swoc++/swoc++.part +++ b/swoc++/swoc++.part @@ -14,15 +14,13 @@ src_files = [ "src/TextView.cc", ] +# export the include directory +inc_files = Pattern(src_dir="include/swoc", includes=["*.h"]) + env.AppendUnique( CCFLAGS=['-std=c++17' ], CPPPATH=["include"], ) -# export the include directory -env.InstallInclude( - Pattern(src_dir="include/",includes=["*.h"]), - ) - -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++-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) diff --git a/unit_tests/unit_tests.part b/unit_tests/unit_tests.part index fe3b357..a5338fe 100644 --- a/unit_tests/unit_tests.part +++ b/unit_tests/unit_tests.part @@ -3,7 +3,7 @@ Import("*") PartName("tests") DependsOn([ - Component("libswoc",requires=REQ.DEFAULT(internal=False)) + Component("libswoc.static", requires=REQ.DEFAULT(internal=False)) ]) env.AppendUnique(
