mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Fix up boost regex linkage issues on non-OSX platforms.
This commit is contained in:
@@ -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})
|
||||
|
@@ -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\")
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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\"
|
||||
|
||||
|
Reference in New Issue
Block a user