Merge branch 'maint'

This commit is contained in:
Geert Janssens
2020-02-06 16:50:08 +01:00
41 changed files with 290 additions and 329 deletions

View File

@@ -32,7 +32,7 @@ if (WITH_SQL)
set(WINSOCK_LIB "")
if(MINGW64)
set(WINSOCK_LIB "-lws2_32")
endif(MINGW64)
endif()
target_link_libraries(gncmod-backend-dbi gnc-backend-sql gnc-engine ${GTK2_LDFLAGS} ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY} ${WINSOCK_LIB})
target_compile_definitions(gncmod-backend-dbi PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.dbi\")
@@ -48,4 +48,4 @@ if (WITH_SQL)
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
# No headers to install
endif(WITH_SQL)
endif()