From afe07041f84c851abce233fc5cacbbfc269d7a01 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 19 Oct 2019 15:37:51 +0100
Subject: Refactor to ease testing

---
 libodbcpp/Jamfile.jam           | 28 +++++++++++++++++++++++-----
 libodbcpp/unittests/Jamfile.jam |  3 ++-
 2 files changed, 25 insertions(+), 6 deletions(-)

(limited to 'libodbcpp')

diff --git a/libodbcpp/Jamfile.jam b/libodbcpp/Jamfile.jam
index bc80fd4..6c2f9b3 100644
--- a/libodbcpp/Jamfile.jam
+++ b/libodbcpp/Jamfile.jam
@@ -1,21 +1,39 @@
 import package ;
+import pkg-config ;
 
 lib adhocutil : : : : <include>/usr/include/adhocutil ;
 lib dbppcore : : : : <include>/usr/include/dbpp ;
 lib boost_date_time ;
 lib boost_system ;
 
+pkg-config.import glibmm : : <name>glibmm-2.4 ;
+pkg-config.import odbc : : <name>odbc ;
+
+project
+  : requirements
+			<cxxstd>17
+			<visibility>hidden
+      <linkflags>"-Wl,-z,defs,--warn-once,--gc-sections"
+      <variant>release:<cxxflags>"-flto=2"
+      <variant>release:<linkflags>"-flto=2"
+			<variant>debug:<warnings>extra
+			<variant>debug:<warnings-as-errors>on
+			<variant>coverage:<coverage>on
+	;
+
 lib dbpp-odbc :
 	[ glob *.cpp ] :
-	<library>..//glibmm
-	<library>..//odbc
+	<library>glibmm
+	<library>odbc
 	<library>adhocutil
-	<library>dbppcore
+	<local-dbppcore>yes:<library>../..//dbppcore
+	<local-dbppcore>no:<library>dbppcore
 	<library>boost_date_time
 	: :
 	<include>.
-	<library>..//glibmm
-	<library>dbppcore
+	<local-dbppcore>yes:<library>../..//dbppcore
+	<local-dbppcore>no:<library>dbppcore
+	<library>glibmm
 	;
 
 build-project unittests ;
diff --git a/libodbcpp/unittests/Jamfile.jam b/libodbcpp/unittests/Jamfile.jam
index 1d9233d..457008e 100644
--- a/libodbcpp/unittests/Jamfile.jam
+++ b/libodbcpp/unittests/Jamfile.jam
@@ -13,7 +13,8 @@ run
 	<define>BOOST_TEST_DYN_LINK
 	<library>..//dbpp-odbc
 	<library>..//adhocutil
-	<library>dbpptestcore
+	<local-dbppcore>yes:<library>../../..//dbpptestcore
+	<local-dbppcore>no:<library>dbpptestcore
 	<library>boost_utf
 	<library>stdc++fs
 	:
-- 
cgit v1.2.3