IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint' into unstable

Browse Source
This commit is contained in:
John Ralls
2017-12-17 13:00:00 -08:00
parent e1d3385428 c1b5e6c8df
commit 0026b10851
14 changed files with 1724 additions and 1387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
libgnucash/backend/sql/CMakeLists.txt
View File

@@ -63,21 +63,22 @@ SET(backend_sql_DIST ${backend_sql_DIST_local} ${test_backend_sql_DIST} PARENT_S
# Add dependency on config.h
SET_SOURCE_FILES_PROPERTIES (${gnc_backend_sql_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
IF(WITH_SQL)
ADD_LIBRARY (gnc-backend-sql
${backend_sql_SOURCES}
${backend_sql_noinst_HEADERS}
)
ADD_LIBRARY (gnc-backend-sql
${backend_sql_SOURCES}
${backend_sql_noinst_HEADERS}
)
TARGET_LINK_LIBRARIES(gnc-backend-sql gncmod-engine)
TARGET_LINK_LIBRARIES(gnc-backend-sql gncmod-engine)
TARGET_COMPILE_DEFINITIONS (gnc-backend-sql PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.sql\")
TARGET_COMPILE_DEFINITIONS (gnc-backend-sql PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.sql\")
TARGET_INCLUDE_DIRECTORIES(gnc-backend-sql PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
TARGET_INCLUDE_DIRECTORIES(gnc-backend-sql PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
INSTALL(TARGETS gnc-backend-sql
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
INSTALL(TARGETS gnc-backend-sql
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
# No headers to install
# No headers to install
ENDIF(WITH_SQL)

18
libgnucash/backend/sql/test/CMakeLists.txt
View File

@@ -14,12 +14,14 @@ SET(BACKEND_SQL_TEST_LIBS gnc-backend-sql gncmod-engine test-core)
SET_DIST_LIST(test_backend_sql_DIST ${test_backend_sql_SOURCES} CMakeLists.txt
Makefile.am test-column-types.cpp)
# This test does not actually do anything.
GNC_ADD_TEST(test-column-types test-column-types.cpp
BACKEND_SQL_TEST_INCLUDE_DIRS BACKEND_SQL_TEST_LIBS
)
IF(WITH_SQL)
# This test does not actually do anything.
GNC_ADD_TEST(test-column-types test-column-types.cpp
BACKEND_SQL_TEST_INCLUDE_DIRS BACKEND_SQL_TEST_LIBS
)
GNC_ADD_TEST(test-sqlbe "${test_backend_sql_SOURCES}"
BACKEND_SQL_TEST_INCLUDE_DIRS BACKEND_SQL_TEST_LIBS
)
TARGET_COMPILE_DEFINITIONS(test-sqlbe PRIVATE TESTPROG=test_sqlbe)
GNC_ADD_TEST(test-sqlbe "${test_backend_sql_SOURCES}"
BACKEND_SQL_TEST_INCLUDE_DIRS BACKEND_SQL_TEST_LIBS
)
TARGET_COMPILE_DEFINITIONS(test-sqlbe PRIVATE TESTPROG=test_sqlbe)
ENDIF(WITH_SQL)