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

Bug 794617 - Can't compile with -DWITH_GNUCASH=NO due to scm-gnome-utils

Browse Source 
Pricedb.go doesn't need gnc-gnome-utils and we don't need WebKit or
gwenhywfar-gtk3 if we have no GUI.
This commit is contained in:
Potuz 2018-06-07 14:17:49 -07:00 committed by John Ralls
parent 690ef626a8
commit e3e1464a01
4 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
CMakeLists.txt
View File

@ -198,32 +198,32 @@ gnc_pkg_check_modules (GTHREAD REQUIRED gthread-2.0>=2.20)
gnc_pkg_check_modules (LIBXML2 REQUIRED libxml-2.0>=2.7.0)
gnc_pkg_check_modules (LIBXSLT REQUIRED libxslt)
if (WIN32 OR APPLE)
gnc_pkg_check_modules (WEBKIT1 REQUIRED webkitgtk-3.0)
set(WEBKIT1 1)
if (WITH_GNUCASH)
if (WIN32 OR APPLE)
gnc_pkg_check_modules (WEBKIT1 REQUIRED webkitgtk-3.0)
set(WEBKIT1 1)
set(WEBKIT_CFLAGS ${WEBKIT2_CFLAGS})
set(WEBKIT_INCLUDE_DIRS ${WEBKIT1_INCLUDE_DIRS})
set(WEBKIT_LDFLAGS ${WEBKIT1_LDFLAGS})
set(WEBKIT_LIBRARIES ${WEBKIT1_LIBRARIES})
else (WIN32 OR APPLE)
gnc_pkg_check_modules (WEBKIT2_4 webkit2gtk-4.0)
if (NOT WEBKIT2_4_FOUND)
gnc_pkg_check_modules (WEBKIT2_3 REQUIRED webkit2gtk-3.0)
set(WEBKIT2_3 1)
set(WEBKIT_CFLAGS ${WEBKIT2_3_CFLAGS})
set(WEBKIT_INCLUDE_DIRS ${WEBKIT2_3_INCLUDE_DIRS})
set(WEBKIT_LDFLAGS ${WEBKIT2_3_LDFLAGS})
set(WEBKIT_LIBRARIES ${WEBKIT2_3_LIBRARIES})
else (NOT WEBKIT2_4_FOUND)
set(WEBKIT2_4 1)
set(WEBKIT_CFLAGS ${WEBKIT2_4_CFLAGS})
set(WEBKIT_INCLUDE_DIRS ${WEBKIT2_4_INCLUDE_DIRS})
set(WEBKIT_LDFLAGS ${WEBKIT2_4_LDFLAGS})
set(WEBKIT_LIBRARIES ${WEBKIT2_4_LIBRARIES})
endif (NOT WEBKIT2_4_FOUND)
endif (WIN32 OR APPLE)
else (WIN32 OR APPLE)
gnc_pkg_check_modules (WEBKIT2_4 webkit2gtk-4.0)
if (NOT WEBKIT2_4_FOUND)
gnc_pkg_check_modules (WEBKIT2_3 REQUIRED webkit2gtk-3.0)
set(WEBKIT2_3 1)
set(WEBKIT_CFLAGS ${WEBKIT2_3_CFLAGS})
set(WEBKIT_INCLUDE_DIRS ${WEBKIT2_3_INCLUDE_DIRS})
set(WEBKIT_LDFLAGS ${WEBKIT2_3_LDFLAGS})
set(WEBKIT_LIBRARIES ${WEBKIT2_3_LIBRARIES})
else (NOT WEBKIT2_4_FOUND)
set(WEBKIT2_4 1)
set(WEBKIT_CFLAGS ${WEBKIT2_4_CFLAGS})
set(WEBKIT_INCLUDE_DIRS ${WEBKIT2_4_INCLUDE_DIRS})
set(WEBKIT_LDFLAGS ${WEBKIT2_4_LDFLAGS})
set(WEBKIT_LIBRARIES ${WEBKIT2_4_LIBRARIES})
endif (NOT WEBKIT2_4_FOUND)
endif (WIN32 OR APPLE)
if (WITH_GNUCASH)
gnc_pkg_check_modules (GTK3 REQUIRED gtk+-3.0>=3.10.0)
endif (WITH_GNUCASH)

4
borrowed/CMakeLists.txt
View File

@ -1,7 +1,9 @@
add_subdirectory(libc)
add_subdirectory(goffice)
add_subdirectory(guile-json)
add_subdirectory(gwengui-gtk3)
if (WITH_GNUCASH)
add_subdirectory(gwengui-gtk3)
endif (WITH_GNUCASH)
set_local_dist(borrowed_DIST_local CMakeLists.txt README)
set(borrowed_DIST ${borrowed_DIST_local} ${libc_DIST} ${guile-json_DIST} ${goffice_DIST} ${gwengui_gtk3_DIST} PARENT_SCOPE)

2
libgnucash/scm/CMakeLists.txt
View File

@ -12,7 +12,7 @@ gnc_add_scheme_targets(scm-scm
gnc_add_scheme_targets(price-quotes
price-quotes.scm
gnucash
"scm-scm;scm-gnome-utils;scm-app-utils"
"scm-scm;scm-app-utils"
FALSE)

1
po/POTFILES.in
View File

@ -450,6 +450,7 @@ gnucash/report/report-system/eguile-utilities.scm
gnucash/report/report-system/gncmod-report-system.c
gnucash/report/report-system/gnc-report.c
gnucash/report/report-system/html-acct-table.scm
gnucash/report/report-system/html-anytag.scm
gnucash/report/report-system/html-barchart.scm
gnucash/report/report-system/html-document.scm
gnucash/report/report-system/html-fonts.scm