gnucash master: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/75cc34a2 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/98e8e4c7 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/66440cb2 (commit)
	from  https://github.com/Gnucash/gnucash/commit/c0f3147a (commit)



commit 75cc34a2db2fa7466039e942a86810c06c32c298
Merge: c0f3147 98e8e4c
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sun Sep 3 12:06:52 2017 +0200

    Merge branch 'maint'
    
    Resolved conflicts:
            gnucash/import-export/CMakeLists.txt

diff --cc gnucash/import-export/CMakeLists.txt
index dfa4ed4,0000000..bfc14b5
mode 100644,000000..100644
--- a/gnucash/import-export/CMakeLists.txt
+++ b/gnucash/import-export/CMakeLists.txt
@@@ -1,90 -1,0 +1,92 @@@
 +# CMakeLists.txt for gnucash/import-export
 +
 +ADD_SUBDIRECTORY(test)
 +
 +# ############################################################
 +if (WITH_AQBANKING)
 +  ADD_SUBDIRECTORY(aqb)
 +endif()
 +ADD_SUBDIRECTORY(bi-import)
 +ADD_SUBDIRECTORY(csv-exp)
 +ADD_SUBDIRECTORY(csv-imp)
 +ADD_SUBDIRECTORY(customer-import)
 +ADD_SUBDIRECTORY(gschemas)
 +ADD_SUBDIRECTORY(log-replay)
- ADD_SUBDIRECTORY(ofx)
++if (WITH_OFX)
++  ADD_SUBDIRECTORY(ofx)
++endif()
 +ADD_SUBDIRECTORY(qif)
 +ADD_SUBDIRECTORY(qif-imp)
 +
 +
 +SET (generic_import_SOURCES
 +  import-account-matcher.c
 +  import-commodity-matcher.c
 +  import-backend.c
 +  import-format-dialog.c
 +  import-match-picker.c
 +  import-parse.c
 +  import-utilities.c
 +  import-settings.c
 +  import-main-matcher.c
 +  import-pending-matches.c
 +  gncmod-generic-import.c
 +)
 +
 +# Add dependency on config.h
 +SET_SOURCE_FILES_PROPERTIES (${generic_import_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
 +
 +SET (generic_import_HEADERS
 +  import-parse.h
 +)
 +
 +SET (generic_import_noinst_HEADERS
 +  import-account-matcher.h
 +  import-backend.h
 +  import-commodity-matcher.h
 +  import-main-matcher.h
 +  import-match-picker.h
 +  import-pending-matches.h
 +  import-settings.h
 +  import-utilities.h
 +)
 +
 +ADD_LIBRARY (gncmod-generic-import
 +  ${generic_import_SOURCES}
 +  ${generic_import_HEADERS}
 +  ${generic_import_noinst_HEADERS}
 +)
 +
 +TARGET_LINK_LIBRARIES(gncmod-generic-import gncmod-gnome-utils gncmod-engine ${GTK3_LDFLAGS} ${GLIB2_LDFLAGS})
 +
 +TARGET_COMPILE_DEFINITIONS (gncmod-generic-import PRIVATE -DG_LOG_DOMAIN=\"gnc.import\")
 +
 +TARGET_INCLUDE_DIRECTORIES(gncmod-generic-import PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 +
 +
 +INSTALL(TARGETS gncmod-generic-import
 +  LIBRARY DESTINATION lib/gnucash
 +  ARCHIVE DESTINATION lib/gnucash
 +  RUNTIME DESTINATION bin
 +)
 +
 +INSTALL(FILES ${generic_import_HEADERS} DESTINATION include/gnucash)
 +
 +SET(generic_import_GLADE dialog-import.glade)
 +
 +INSTALL(FILES ${generic_import_GLADE} DESTINATION share/gnucash/gtkbuilder)
 +
 +
 +FILE(COPY ${generic_import_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
 +
 +SET(generic_import_EXTRA_DIST generic-import-design.txt)
 +
 +SET_LOCAL_DIST(import_export_DIST_local CMakeLists.txt Makefile.am ${generic_import_SOURCES}
 +        ${generic_import_HEADERS} ${generic_import_GLADE} ${generic_import_noinst_HEADERS}
 +        ${generic_import_EXTRA_DIST})
 +
 +SET(import_export_DIST ${import_export_DIST_local} ${aqbanking_DIST} ${bi_import_DIST}
 +        ${csv_export_DIST} ${csv_import_DIST} ${customer_import_DIST}
 +        ${generic_import_gschema_DIST} ${log_report_DIST} ${ofx_DIST} ${qif_DIST} ${qif_import_DIST}
 +        ${test_generic_import_DIST}
 +        PARENT_SCOPE)

commit 98e8e4c767326c19ea678ddf804a0651396b0c17
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sun Sep 3 12:05:00 2017 +0200

    Only build aqbanking when requested

diff --git a/src/import-export/CMakeLists.txt b/src/import-export/CMakeLists.txt
index 0ded393..7991a92 100644
--- a/src/import-export/CMakeLists.txt
+++ b/src/import-export/CMakeLists.txt
@@ -3,7 +3,9 @@
 ADD_SUBDIRECTORY(test)
 
 # ############################################################
-ADD_SUBDIRECTORY(aqb)
+if (WITH_AQBANKING)
+  ADD_SUBDIRECTORY(aqb)
+endif()
 ADD_SUBDIRECTORY(csv-exp)
 ADD_SUBDIRECTORY(csv-imp)
 ADD_SUBDIRECTORY(gschemas)

commit 66440cb203b1af7b2e484ee71448653b8410b173
Author: Sumit Bhardwaj <bhardwajs at users.noreply.github.com>
Date:   Sat Sep 2 13:53:54 2017 -0700

    Added WITH_OFX fix to CMakeLists in gnucash/import-export/ofx

diff --git a/src/import-export/CMakeLists.txt b/src/import-export/CMakeLists.txt
index 7bb6ba4..0ded393 100644
--- a/src/import-export/CMakeLists.txt
+++ b/src/import-export/CMakeLists.txt
@@ -8,7 +8,9 @@ ADD_SUBDIRECTORY(csv-exp)
 ADD_SUBDIRECTORY(csv-imp)
 ADD_SUBDIRECTORY(gschemas)
 ADD_SUBDIRECTORY(log-replay)
-ADD_SUBDIRECTORY(ofx)
+if (WITH_OFX)
+  ADD_SUBDIRECTORY(ofx)
+endif()
 ADD_SUBDIRECTORY(qif)
 ADD_SUBDIRECTORY(qif-imp)
 



Summary of changes:
 gnucash/import-export/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)