diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-28 17:28:55 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-28 17:28:55 +0200 |
| commit | 38bb6be4c90c7fbf95b8e5345de21175d3f1ebd7 (patch) | |
| tree | 84951cb58515bb8258b6bced4f33b475864a40e4 | |
| parent | ae9319f689d9c38c08cb697ea365506d47642873 (diff) | |
Update build infrastructure
| -rw-r--r-- | brep/buildfile | 12 | ||||
| -rw-r--r-- | brep/types | 2 | ||||
| -rw-r--r-- | build/root.build | 3 | ||||
| -rw-r--r-- | load/buildfile | 6 | ||||
| -rw-r--r-- | migrate/buildfile | 4 | ||||
| -rw-r--r-- | mod/buildfile | 8 |
6 files changed, 20 insertions, 15 deletions
diff --git a/brep/buildfile b/brep/buildfile index b1e80a3..d34a6e5 100644 --- a/brep/buildfile +++ b/brep/buildfile @@ -6,11 +6,10 @@ define sql: file sql{*}: extension = sql sql{*}: install = data/ -# lib{brep} -# -import libs += libodb%lib{odb} -import libs += libodb-pgsql%lib{odb-pgsql} -import libs += libbpkg%lib{bpkg} +import int_libs = libodb%lib{odb} +import int_libs += libodb-pgsql%lib{odb-pgsql} +import int_libs += libbutl%lib{butl} +import int_libs += libbpkg%lib{bpkg} lib{brep}: \ {hxx cxx}{ package } \ @@ -23,10 +22,11 @@ lib{brep}: \ {hxx }{ utility } \ {hxx }{ version } \ {hxx }{ wrapper-traits } \ -$libs \ + $int_libs \ sql{package package-extra} lib{brep}: cxx.export.poptions = -I$out_root -I$src_root +lib{brep}: cxx.export.libs = $int_libs # Install into the brep/ subdirectory of, say, /usr/include/. # @@ -28,7 +28,7 @@ namespace brep { - // Commonly-used types. + // Commonly-used types. // using std::uint8_t; using std::uint16_t; diff --git a/build/root.build b/build/root.build index 3d1fe01..5a452d9 100644 --- a/build/root.build +++ b/build/root.build @@ -2,6 +2,8 @@ # copyright : Copyright (c) 2014-2016 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file +cxx.std = 14 + using cxx hxx{*}: extension = @@ -9,7 +11,6 @@ ixx{*}: extension = ixx txx{*}: extension = txx cxx{*}: extension = cxx -cxx.std = 11 cxx.poptions =+ -I$out_root -I$src_root # Load the cli module but only if it's available. This way a distribution diff --git a/load/buildfile b/load/buildfile index 8cd61fc..db5a5ac 100644 --- a/load/buildfile +++ b/load/buildfile @@ -2,10 +2,10 @@ # copyright : Copyright (c) 2014-2016 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -import libs += libbpkg%lib{bpkg} -import libs += libbutl%lib{butl} +import libs = libodb%lib{odb} import libs += libodb-pgsql%lib{odb-pgsql} -import libs += libodb%lib{odb} +import libs += libbutl%lib{butl} +import libs += libbpkg%lib{bpkg} include ../brep/ diff --git a/migrate/buildfile b/migrate/buildfile index 1722fea..2bdbe9e 100644 --- a/migrate/buildfile +++ b/migrate/buildfile @@ -2,9 +2,9 @@ # copyright : Copyright (c) 2014-2016 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -import libs += libbutl%lib{butl} +import libs = libodb%lib{odb} import libs += libodb-pgsql%lib{odb-pgsql} -import libs += libodb%lib{odb} +import libs += libbutl%lib{butl} include ../brep/ diff --git a/mod/buildfile b/mod/buildfile index a2fb494..64e68b2 100644 --- a/mod/buildfile +++ b/mod/buildfile @@ -17,10 +17,14 @@ else mod{*}: install = libexec/ +# While we don't need to link to APR, we need to find its header location. +# +import libs = libapr1%lib{apr-1} +import libs += libstudxml%lib{studxml} import libs += libodb%lib{odb} import libs += libodb-pgsql%lib{odb-pgsql} +import libs += libbutl%lib{butl} import libs += libbpkg%lib{bpkg} -import libs += libstudxml%lib{studxml} include ../brep/ @@ -34,7 +38,7 @@ mod{brep}: \ {hxx cxx}{ mod-repository-details } \ {hxx cxx}{ mod-repository-root } \ {hxx cxx}{ module } \ - {hxx ixx cxx}{ options } \ + {hxx ixx cxx}{ options } \ {hxx }{ options-types } \ {hxx cxx}{ page } \ { cxx}{ services } \ |