gnucash master: Fix up boost regex linkage issues on non-OSX platforms.

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/94ca7802 (commit)
	from  https://github.com/Gnucash/gnucash/commit/36967708 (commit)



commit 94ca78025e5cd5412c6b6ffd59514c42a9cf3221
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat May 21 11:04:12 2016 -0700

    Fix up boost regex linkage issues on non-OSX platforms.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a60f7af..c3ab49d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -352,7 +352,7 @@ ENDIF()
 SET (Boost_USE_MULTITHREADED ON)
 SET (Boost_FIND_QUIETLY ON)
 
-FIND_PACKAGE (Boost 1.54.0 REQUIRED COMPONENTS date_time)
+FIND_PACKAGE (Boost 1.54.0 REQUIRED COMPONENTS date_time regex)
 
 IF (Boost_FOUND)
   include_directories(${Boost_INCLUDE_DIRS})
diff --git a/src/backend/dbi/CMakeLists.txt b/src/backend/dbi/CMakeLists.txt
index a871a50..2a3d4a0 100644
--- a/src/backend/dbi/CMakeLists.txt
+++ b/src/backend/dbi/CMakeLists.txt
@@ -19,7 +19,7 @@ ADD_LIBRARY	(gncmod-backend-dbi
   ${backend_dbi_noinst_HEADERS}
 )
 
-TARGET_LINK_LIBRARIES(gncmod-backend-dbi gnc-backend-sql gncmod-engine gnc-qof ${GTK2_LDFLAGS} ${LIBDBI_LIBRARY})
+TARGET_LINK_LIBRARIES(gncmod-backend-dbi gnc-backend-sql gncmod-engine gnc-qof ${GTK2_LDFLAGS} ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY})
 
 TARGET_COMPILE_DEFINITIONS(gncmod-backend-dbi PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.dbi\")
 
diff --git a/src/backend/dbi/test/CMakeLists.txt b/src/backend/dbi/test/CMakeLists.txt
index db2ddcb..11a6bfe 100644
--- a/src/backend/dbi/test/CMakeLists.txt
+++ b/src/backend/dbi/test/CMakeLists.txt
@@ -11,13 +11,14 @@ SET(BACKEND_DBI_TEST_INCLUDE_DIRS
   ${LIBDBI_INCLUDE_PATH}
   ${GLIB2_INCLUDE_DIRS}
 )
-SET(BACKEND_DBI_TEST_LIBS gnc-backend-sql gncmod-backend-dbi gncmod-engine gncmod-test-engine gnc-qof test-core ${LIBDBI_LIBRARY})
+SET(BACKEND_DBI_TEST_LIBS gnc-backend-sql gncmod-engine gncmod-test-engine gnc-qof test-core ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY})
 
 SET(test_dbi_backend_SOURCES
   test-backend-dbi.cpp
   test-backend-dbi-basic.cpp
   test-dbi-business-stuff.cpp
   test-dbi-stuff.cpp
+  ../gnc-backend-dbi.cpp
 )
 
 # This test does not work on Win32
diff --git a/src/backend/dbi/test/Makefile.am b/src/backend/dbi/test/Makefile.am
index ffb6801..4650b5a 100644
--- a/src/backend/dbi/test/Makefile.am
+++ b/src/backend/dbi/test/Makefile.am
@@ -67,7 +67,10 @@ test_backend_dbi_CPPFLAGS = \
 	-DDBI_TEST_XML_FILENAME=\"${srcdir}/test-dbi.xml\" \
 	${AM_CPPFLAGS}
 
-
+test_backend_dbi_LDADD = \
+    ${BOOST_LDADD} -lboost_regex \
+    ${LIBDBI_LIBS} \
+    ${LDADD}
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.dbi\"
 



Summary of changes:
 CMakeLists.txt                      | 2 +-
 src/backend/dbi/CMakeLists.txt      | 2 +-
 src/backend/dbi/test/CMakeLists.txt | 3 ++-
 src/backend/dbi/test/Makefile.am    | 5 ++++-
 4 files changed, 8 insertions(+), 4 deletions(-)