From 5917a084774c0f5f874455048d1a92fd491fbf9b Mon Sep 17 00:00:00 2001
From: randomdan <randomdan@localhost>
Date: Thu, 6 Nov 2014 01:27:43 +0000
Subject: Use Boost UTF library

---
 libjsonpp/Jamfile.jam |  9 ++++-----
 libjsonpp/test1.cpp   |  5 ++++-
 libjsonpp/testpch.hpp | 12 ------------
 3 files changed, 8 insertions(+), 18 deletions(-)
 delete mode 100644 libjsonpp/testpch.hpp

diff --git a/libjsonpp/Jamfile.jam b/libjsonpp/Jamfile.jam
index da6de95..f3cab3d 100644
--- a/libjsonpp/Jamfile.jam
+++ b/libjsonpp/Jamfile.jam
@@ -5,6 +5,7 @@ alias glibmm : : : :
 	<cflags>"`pkg-config --cflags glibmm-2.4`"
 	<linkflags>"`pkg-config --libs glibmm-2.4`"
 	;
+lib boost_utf : : <name>boost_unit_test_framework ;
 
 cpp-pch pch : pch.hpp :
 	<library>glibmm
@@ -18,15 +19,13 @@ lib jsonpp :
 	<include>.
 	;
 
-cpp-pch testpch : testpch.hpp :
-	<library>glibmm
-	<library>jsonpp
-	;
 unit-test test1 :
-	testpch
 	test1.cpp
+	pch
 	:
+	<define>BOOST_TEST_DYN_LINK
 	<library>jsonpp
+	<library>boost_utf
 	;
 
 package.install install : <install-source-root>. : : jsonpp : [ glob *.h ] ;
diff --git a/libjsonpp/test1.cpp b/libjsonpp/test1.cpp
index eaeccf7..705b18b 100644
--- a/libjsonpp/test1.cpp
+++ b/libjsonpp/test1.cpp
@@ -1,7 +1,10 @@
+#include <pch.hpp>
+
 #define BOOST_TEST_MODULE parsing
-#include <boost/test/included/unit_test.hpp>
+#include <boost/test/unit_test.hpp>
 
 #include "jsonpp.h"
+#include <fstream>
 
 BOOST_AUTO_TEST_CASE( parse_bool_true )
 {
diff --git a/libjsonpp/testpch.hpp b/libjsonpp/testpch.hpp
deleted file mode 100644
index 442c866..0000000
--- a/libjsonpp/testpch.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifdef BOOST_BUILD_PCH_ENABLED
-#ifndef JSON_TESTPCH
-#define JSON_TESTPCH
-
-#define BOOST_TEST_MODULE example
-#include <boost/test/included/unit_test.hpp>
-#include "jsonpp.h"
-
-#endif
-#endif
-
-
-- 
cgit v1.2.3