More conversions from pkg-config variables to imported targets.

Also converts ICU detection from pkgconfig to FindICU.
This commit is contained in:
John Ralls
2019-09-13 17:02:41 -07:00
parent e4eedfe662
commit 1a9fcfefad
36 changed files with 90 additions and 142 deletions

View File

@@ -33,7 +33,7 @@ if (WITH_SQL)
if(MINGW64)
set(WINSOCK_LIB "-lws2_32")
endif(MINGW64)
target_link_libraries(gncmod-backend-dbi gnc-backend-sql gncmod-engine ${GTK2_LDFLAGS} ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY} ${WINSOCK_LIB})
target_link_libraries(gncmod-backend-dbi gnc-backend-sql gncmod-engine ${GTK2_LDFLAGS} Boost::regex ${LIBDBI_LIBRARY} ${WINSOCK_LIB})
target_compile_definitions(gncmod-backend-dbi PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.dbi\")

View File

@@ -8,9 +8,8 @@ set(BACKEND_DBI_TEST_INCLUDE_DIRS
${CMAKE_SOURCE_DIR}/libgnucash/engine/test-core
${CMAKE_SOURCE_DIR}/common/test-core
${LIBDBI_INCLUDE_PATH}
${GLIB2_INCLUDE_DIRS}
)
set(BACKEND_DBI_TEST_LIBS gnc-backend-sql gncmod-engine gncmod-test-engine test-core ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY})
set(BACKEND_DBI_TEST_LIBS gnc-backend-sql gncmod-engine gncmod-test-engine test-core PkgConfig::GLIB2 Boost::regex ${LIBDBI_LIBRARY})
set(test_dbi_backend_SOURCES
test-backend-dbi.cpp