Yes, Thanks. Committed on your behalf and pushed. Regards, John Ralls
> On Sep 13, 2019, at 10:37 AM, Matthew Forbis via gnucash-devel > <gnucash-devel@gnucash.org> wrote: > > I might have fixed it myself. Does the following change make sense? > > > > CMakeLists.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/CMakeLists.txt b/CMakeLists.txt > index 0654dfb5a..b054f9cc2 100644 > --- a/CMakeLists.txt > +++ b/CMakeLists.txt > @@ -217,9 +217,9 @@ if (WITH_GNUCASH) > pkg_check_modules (WEBKIT REQUIRED IMPORTED_TARGET webkitgtk-3.0) > else() > pkg_check_modules (WEBKIT REQUIRED webkitgtk-3.0) > + _pkg_create_imp_target(WEBKIT) > endif() > set(WEBKIT1 1 CACHE INTERNAL "WebKitGtk") > - _pkg_create_imp_target(WEBKIT) > else (WIN32 OR APPLE) > If (NOT CMAKE_VERSION VERSION_LESS 3.6) > pkg_check_modules (WEBKIT IMPORTED_TARGET webkit2gtk-4.0) > > > Thanks, > Matt > > > > On Friday, September 13, 2019, 12:26:22 PM CDT, Matthew Forbis via > gnucash-devel <gnucash-devel@gnucash.org> wrote: > > > > > > Hi, > I'm attempting to build on windows to try to still solve the report bug I'm > interested in and it seems that the patch below might have broken the windows > build (or I don't know what I'm doing is also a possibilty). > With the commit John pushed yesterday, I get the following error message when > cmake is running: > > CMake Error at CMakeLists.txt:222 (_pkg_create_imp_target): > _pkg_create_imp_target Function invoked with incorrect arguments for > function named: _pkg_create_imp_target > > Can anyone help? > Thanks,Matt > > > On Thursday, September 12, 2019, 11:22:42 PM CDT, John Ralls > <jra...@code.gnucash.org> wrote: > > Updated via https://github.com/Gnucash/gnucash/commit/41c58ec0 (commit) > via https://github.com/Gnucash/gnucash/commit/c23f3f05 (commit) > from https://github.com/Gnucash/gnucash/commit/70eb7172 (commit) > > > > commit 41c58ec00ab2276ca9b326570d07689fc47bc7e9 > Author: John Ralls <jra...@ceridwen.us> > Date: Thu Sep 12 14:45:23 2019 -0700 > > Convert Gtk3 and Webkit to imported targets. > > This causes CMake to include their headers with -isystem instead of -I, > so the compiler doesn't generate warnings on them. ArchLinux was failing > to build because of such warnings. > > Includes a function from cmake 3.6 to allow this to work on systems like > Ubuntu 14.04 that still provide only cmake 3.5. > > commit c23f3f05e311d81ce0fbb7bbc6b850e5acd5776d > Author: John Ralls <jra...@ceridwen.us> > Date: Tue Sep 10 16:33:33 2019 -0700 > > Fix deprecated G_TYPE_INSTANCE_GET_PRIVATE and G_INLINE_FUNC > > with the function/declaration that they substituted. > Note that this doesn't use the recommended new GObject creation macros > because the class names in libgnucash/engine don't follow the gnome > naming convention. > > > > Summary of changes: > CMakeLists.txt | 61 ++++++++++++++-------- > common/cmake_modules/GncPkgConfig.cmake | 52 ++++++++++++++++++ > gnucash/CMakeLists.txt | 6 +-- > gnucash/gnome-search/CMakeLists.txt | 2 +- > gnucash/gnome-search/gnc-general-search.c | 2 +- > gnucash/gnome-search/search-account.c | 2 +- > gnucash/gnome-search/search-boolean.c | 2 +- > gnucash/gnome-search/search-core-type.c | 2 +- > gnucash/gnome-search/search-date.c | 2 +- > gnucash/gnome-search/search-double.c | 2 +- > gnucash/gnome-search/search-int64.c | 2 +- > gnucash/gnome-search/search-numeric.c | 2 +- > gnucash/gnome-search/search-reconciled.c | 2 +- > gnucash/gnome-search/search-string.c | 2 +- > gnucash/gnome-utils/CMakeLists.txt | 4 +- > gnucash/gnome-utils/gnc-combott.c | 3 +- > gnucash/gnome-utils/gnc-currency-edit.c | 2 +- > gnucash/gnome-utils/gnc-date-format.c | 2 +- > gnucash/gnome-utils/gnc-embedded-window.c | 2 +- > gnucash/gnome-utils/gnc-main-window.c | 2 +- > gnucash/gnome-utils/gnc-period-select.c | 2 +- > gnucash/gnome-utils/gnc-plugin-file-history.c | 2 +- > gnucash/gnome-utils/gnc-plugin-manager.c | 2 +- > gnucash/gnome-utils/gnc-plugin-menu-additions.c | 2 +- > gnucash/gnome-utils/gnc-plugin-page.c | 2 +- > gnucash/gnome-utils/gnc-plugin.c | 2 +- > gnucash/gnome-utils/gnc-query-view.c | 2 +- > gnucash/gnome-utils/gnc-tree-model-account-types.c | 3 +- > gnucash/gnome-utils/gnc-tree-model-account.c | 2 +- > gnucash/gnome-utils/gnc-tree-model-commodity.c | 2 +- > gnucash/gnome-utils/gnc-tree-model-owner.c | 2 +- > gnucash/gnome-utils/gnc-tree-model-price.c | 2 +- > gnucash/gnome-utils/gnc-tree-model-selection.c | 2 +- > gnucash/gnome-utils/gnc-tree-model-split-reg.c | 2 +- > gnucash/gnome-utils/gnc-tree-model.c | 2 +- > gnucash/gnome-utils/gnc-tree-view-account.c | 2 +- > gnucash/gnome-utils/gnc-tree-view-commodity.c | 2 +- > gnucash/gnome-utils/gnc-tree-view-owner.c | 2 +- > gnucash/gnome-utils/gnc-tree-view-price.c | 2 +- > gnucash/gnome-utils/gnc-tree-view-split-reg.c | 2 +- > gnucash/gnome-utils/gnc-tree-view-sx-list.c | 2 +- > gnucash/gnome-utils/gnc-tree-view.c | 2 +- > gnucash/gnome-utils/search-param.c | 6 +-- > gnucash/gnome-utils/test/CMakeLists.txt | 2 +- > gnucash/gnome/CMakeLists.txt | 2 +- > gnucash/gnome/gnc-budget-view.c | 2 +- > gnucash/gnome/gnc-plugin-account-tree.c | 2 +- > gnucash/gnome/gnc-plugin-basic-commands.c | 2 +- > gnucash/gnome/gnc-plugin-budget.c | 2 +- > gnucash/gnome/gnc-plugin-business.c | 2 +- > gnucash/gnome/gnc-plugin-page-account-tree.c | 2 +- > gnucash/gnome/gnc-plugin-page-budget.c | 2 +- > gnucash/gnome/gnc-plugin-page-invoice.c | 2 +- > gnucash/gnome/gnc-plugin-page-owner-tree.c | 2 +- > gnucash/gnome/gnc-plugin-page-register.c | 2 +- > gnucash/gnome/gnc-plugin-page-register2.c | 2 +- > gnucash/gnome/gnc-plugin-page-sx-list.c | 2 +- > gnucash/gnome/gnc-plugin-register.c | 2 +- > gnucash/gnome/gnc-plugin-register2.c | 2 +- > gnucash/gnome/search-owner.c | 2 +- > gnucash/html/CMakeLists.txt | 5 +- > gnucash/html/gnc-html.c | 6 ++- > gnucash/import-export/CMakeLists.txt | 2 +- > .../import-export/csv-exp/gnc-plugin-csv-export.c | 2 +- > .../import-export/csv-imp/gnc-plugin-csv-import.c | 2 +- > gnucash/import-export/log-replay/CMakeLists.txt | 2 +- > .../log-replay/gnc-plugin-log-replay.c | 2 +- > gnucash/import-export/ofx/gnc-plugin-ofx.c | 2 +- > .../import-export/qif-imp/gnc-plugin-qif-import.c | 2 +- > gnucash/register/ledger-core/CMakeLists.txt | 2 +- > gnucash/register/register-gnome/CMakeLists.txt | 4 +- > .../register-gnome/gnucash-sheet-private.c | 2 +- > gnucash/register/register-gnome/gnucash-sheet.c | 2 +- > gnucash/report/report-gnome/CMakeLists.txt | 2 +- > .../report/report-gnome/gnc-plugin-page-report.c | 2 +- > gnucash/report/report-system/CMakeLists.txt | 4 +- > gnucash/report/stylesheets/CMakeLists.txt | 2 +- > .../report/stylesheets/gnc-plugin-stylesheets.c | 2 +- > libgnucash/app-utils/gnc-ui-util.c | 4 +- > libgnucash/engine/Account.cpp | 4 +- > libgnucash/engine/Transaction.c | 4 +- > libgnucash/engine/gnc-budget.c | 2 +- > libgnucash/engine/gnc-commodity.c | 2 +- > libgnucash/engine/gnc-lot.c | 2 +- > libgnucash/engine/gncAddress.c | 2 +- > libgnucash/engine/gncCustomer.c | 2 +- > libgnucash/engine/gncEmployee.c | 2 +- > libgnucash/engine/gncEntry.c | 2 +- > libgnucash/engine/gncJob.c | 2 +- > libgnucash/engine/gncOrder.c | 2 +- > libgnucash/engine/gncVendor.c | 2 +- > libgnucash/engine/qofinstance.cpp | 2 +- > 92 files changed, 194 insertions(+), 128 deletions(-) > create mode 100644 common/cmake_modules/GncPkgConfig.cmake > > _______________________________________________ > gnucash-patches mailing list > gnucash-patc...@gnucash.org > https://lists.gnucash.org/mailman/listinfo/gnucash-patches > > > _______________________________________________ > gnucash-devel mailing list > gnucash-devel@gnucash.org > https://lists.gnucash.org/mailman/listinfo/gnucash-devel > > _______________________________________________ > gnucash-devel mailing list > gnucash-devel@gnucash.org > https://lists.gnucash.org/mailman/listinfo/gnucash-devel _______________________________________________ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel