core-utils - move guile utils to bindings/guile

bindings/guile/CMakeLists.txt

@@ -1,15 +1,29 @@
 add_subdirectory(test)
 
-set(guile_HEADERS )
+set(guile_HEADERS
+    gnc-guile-utils.h)
 
 set(guile_SOURCES
-    gnc-guile-bindings.c)
-set(guile_bindings_ALL_INCLUDES
-    ${CMAKE_BINARY_DIR}/common
-    ${CMAKE_CURRENT_SOURCE_DIR})
+    gnc-guile-bindings.c
+    gnc-guile-utils.c)
+
 
 add_library(gnucash-guile SHARED ${guile_SOURCES} ${guile_HEADERS})
-target_include_directories(gnucash-guile PUBLIC ${guile_bindings_ALL_INCLUDES})
+
+target_include_directories(gnucash-guile
+    PRIVATE
+        ${CMAKE_SOURCE_DIR}/common
+        ${CMAKE_BINARY_DIR}/common
+        ${GLIB2_INCLUDE_DIRS}
+        ${GUILE_INCLUDE_DIRS}
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR})
+
+target_link_libraries(gnucash-guile
+    ${GUILE_LDFLAGS}
+    ${GLIB2_LDFLAGS}
+    ${GOBJECT_LDFLAGS}
+    ${GTK_MAC_LDFLAGS})
 
 install(TARGETS gnucash-guile
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

gnucash/gnome-utils/CMakeLists.txt

@@ -204,9 +204,15 @@ add_library (gncmod-gnome-utils
   ${gnome_utils_noinst_HEADERS}
 )
 
-target_link_libraries(gncmod-gnome-utils gncmod-app-utils gncmod-engine
-  gnc-backend-xml-utils PkgConfig::GTK3 ${CMAKE_DL_LIBS} ${LIBSECRET_LDFLAGS}
-  ${GTK_MAC_LDFLAGS})
+target_link_libraries(gncmod-gnome-utils
+    gncmod-app-utils
+    gncmod-engine
+    gnc-backend-xml-utils
+    gnucash-guile
+    PkgConfig::GTK3
+    ${CMAKE_DL_LIBS}
+    ${LIBSECRET_LDFLAGS}
+    ${GTK_MAC_LDFLAGS})
 
 target_compile_options(gncmod-gnome-utils PRIVATE -Wno-deprecated-declarations)
 target_compile_definitions(gncmod-gnome-utils PUBLIC ${GTK_MAC_CFLAGS_OTHER}

gnucash/gnome/CMakeLists.txt

@@ -136,9 +136,18 @@ set (gnc_gnome_SOURCES
 set_source_files_properties (${gnc_gnome_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
 
 add_library (gnc-gnome ${gnc_gnome_SOURCES} ${gnc_gnome_noinst_HEADERS} ${SWIG_GNOME_C})
-target_link_libraries(gnc-gnome gncmod-gnome-search gncmod-ledger-core
-  gncmod-html gncmod-report gncmod-register-gnome gncmod-register-core
-  gncmod-gnome-utils gncmod-engine PkgConfig::GTK3 ${GTK_MAC_LDFLAGS})
+target_link_libraries(gnc-gnome
+    gncmod-gnome-search
+    gncmod-ledger-core
+    gncmod-html
+    gncmod-report
+    gncmod-register-gnome
+    gncmod-register-core
+    gncmod-gnome-utils
+    gncmod-engine
+    gnucash-guile
+    PkgConfig::GTK3
+    ${GTK_MAC_LDFLAGS})
 
 target_compile_definitions (gnc-gnome PRIVATE -DG_LOG_DOMAIN=\"gnc.gui\" ${GTK_MAC_CFLAGS_OTHER})
 target_compile_options(gnc-gnome PRIVATE -Wno-deprecated-declarations)

gnucash/import-export/qif-imp/CMakeLists.txt

@@ -20,7 +20,11 @@ set (qif_import_noinst_HEADERS
 
 add_library	(gncmod-qif-import ${qif_import_SOURCES} ${qif_import_noinst_HEADERS})
 
-target_link_libraries(gncmod-qif-import gncmod-app-utils gncmod-gnome-utils gnc-gnome)
+target_link_libraries(gncmod-qif-import
+    gncmod-app-utils
+    gncmod-gnome-utils
+    gnc-gnome
+    gnucash-guile)
 
 target_compile_definitions(gncmod-qif-import PRIVATE -DG_LOG_DOMAIN=\"gnc.import.qif.import\")
 

gnucash/report/CMakeLists.txt

@@ -27,10 +27,15 @@ add_library (gncmod-report
 
 target_compile_definitions(gncmod-report PRIVATE -DG_LOG_DOMAIN=\"gnc.report.core\")
 
-target_link_libraries(gncmod-report gnc-module gncmod-app-utils PkgConfig::GTK3 ${GUILE_LDFLAGS})
+target_link_libraries(gncmod-report
+    gnc-module
+    gncmod-app-utils
+    gnucash-guile
+    PkgConfig::GTK3
+    ${GUILE_LDFLAGS})
 
 target_include_directories (gncmod-report
-    PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} 
+    PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 

libgnucash/app-utils/CMakeLists.txt

@@ -78,9 +78,20 @@ set (app_utils_SOURCES
 set_source_files_properties (${app_utils_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
 
 set(app_utils_ALL_SOURCES ${app_utils_SOURCES} ${app_utils_HEADERS} ${app_utils_noinst_HEADERS})
-set(app_utils_ALL_LIBRARIES gncmod-engine gnc-module ${GIO_LDFLAGS} ${LIBXML2_LDFLAGS} ${LIBXSLT_LDFLAGS})
-set(app_utils_ALL_INCLUDES  ${CMAKE_CURRENT_SOURCE_DIR}/calculation ${GIO_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS}
-    ${LIBXSLT_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/libgnucash/backend ${CMAKE_SOURCE_DIR}/libgnucash/engine)
+set(app_utils_ALL_LIBRARIES
+    gncmod-engine
+    gnc-module
+    gnucash-guile
+    ${GIO_LDFLAGS}
+    ${LIBXML2_LDFLAGS}
+    ${LIBXSLT_LDFLAGS})
+set(app_utils_ALL_INCLUDES
+    ${CMAKE_CURRENT_SOURCE_DIR}/calculation
+    ${GIO_INCLUDE_DIRS}
+    ${LIBXML2_INCLUDE_DIRS}
+    ${LIBXSLT_INCLUDE_DIRS}
+    ${CMAKE_SOURCE_DIR}/libgnucash/backend
+    ${CMAKE_SOURCE_DIR}/libgnucash/engine)
 
 if (WIN32)
   list(APPEND app_utils_ALL_SOURCES gnc-help-utils.c)

libgnucash/core-utils/CMakeLists.txt

@@ -22,7 +22,6 @@ set (core_utils_SOURCES
   gnc-filepath-utils.cpp
   gnc-gkeyfile-utils.c
   gnc-glib-utils.c
-  gnc-guile-utils.c
   gnc-jalali.c
   gnc-locale-utils.c
   gnc-locale-utils.cpp
@@ -86,7 +85,6 @@ set(core_utils_noinst_HEADERS
   gnc-filepath-utils.h
   gnc-gkeyfile-utils.h
   gnc-glib-utils.h
-  gnc-guile-utils.h
   gnc-jalali.h
   gnc-locale-utils.h
   gnc-locale-utils.hpp

libgnucash/engine/CMakeLists.txt

@@ -237,12 +237,25 @@ else()
   set(BCRYPT "")
 endif()
 
-target_link_libraries(gncmod-engine gnc-core-utils gnc-module ${Boost_DATE_TIME_LIBRARIES}  ${Boost_REGEX_LIBRARIES}  ${ICU4C_I18N_LDFLAGS} ${BCRYPT} ${REGEX_LDFLAGS} ${GMODULE_LDFLAGS} ${GLIB2_LDFLAGS} ${GOBJECT_LDFLAGS} ${GUILE_LDFLAGS})
+target_link_libraries(gncmod-engine
+    gnc-core-utils
+    gnc-module
+    gnucash-guile
+    ${Boost_DATE_TIME_LIBRARIES}
+    ${Boost_REGEX_LIBRARIES}
+    ${ICU4C_I18N_LDFLAGS}
+    ${BCRYPT}
+    ${REGEX_LDFLAGS}
+    ${GMODULE_LDFLAGS}
+    ${GLIB2_LDFLAGS}
+    ${GOBJECT_LDFLAGS}
+    ${GUILE_LDFLAGS})
 
 target_compile_definitions (gncmod-engine PRIVATE -DG_LOG_DOMAIN=\"gnc.engine\")
 
 target_include_directories (gncmod-engine
-    PRIVATE ${CMAKE_CURRENT_BINARY_DIR} # for iso-4217-currencies.c
+    PRIVATE
+        ${CMAKE_CURRENT_BINARY_DIR} # for iso-4217-currencies.c
     PUBLIC
         ${CMAKE_CURRENT_SOURCE_DIR}
         ${CMAKE_BINARY_DIR}/common # for config.h

po/POTFILES.in

@@ -1,6 +1,7 @@
 # This is a list of files which contain translatable strings.
 # This file was autogenerated by cmake.
 bindings/guile/gnc-guile-bindings.c
+bindings/guile/gnc-guile-utils.c
 bindings/guile/price-quotes.scm
 bindings/guile/utilities.scm
 borrowed/goffice/go-charmap-sel.c
@@ -607,7 +608,6 @@ libgnucash/core-utils/gnc-environment.c
 libgnucash/core-utils/gnc-filepath-utils.cpp
 libgnucash/core-utils/gnc-gkeyfile-utils.c
 libgnucash/core-utils/gnc-glib-utils.c
-libgnucash/core-utils/gnc-guile-utils.c
 libgnucash/core-utils/gnc-jalali.c
 libgnucash/core-utils/gnc-locale-utils.c
 libgnucash/core-utils/gnc-locale-utils.cpp