gnucash unstable: Bug 787497 - Disabling OFX, AqBanking or python-bindings support cripples the dist build target

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/56a58e65 (commit)
	from  https://github.com/Gnucash/gnucash/commit/e6edb9d8 (commit)



commit 56a58e65289d343caf390f677d8365559d332e5a
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sat Feb 3 16:58:52 2018 +0100

    Bug 787497 - Disabling OFX, AqBanking or python-bindings support cripples the dist build target

diff --git a/borrowed/CMakeLists.txt b/borrowed/CMakeLists.txt
index cf7e0e0..c88aa61 100644
--- a/borrowed/CMakeLists.txt
+++ b/borrowed/CMakeLists.txt
@@ -1,7 +1,6 @@
 ADD_SUBDIRECTORY(libc)
 ADD_SUBDIRECTORY(goffice)
-if (WITH_AQBANKING AND NOT HAVE_GWEN_GTK3)
-  ADD_SUBDIRECTORY(gwengui-gtk3)
-endif()
+ADD_SUBDIRECTORY(gwengui-gtk3)
+
 SET_LOCAL_DIST(borrowed_DIST_local CMakeLists.txt README)
 SET(borrowed_DIST ${borrowed_DIST_local} ${libc_DIST} ${goffice_DIST} ${gwengui_gtk3_DIST} PARENT_SCOPE)
diff --git a/borrowed/gwengui-gtk3/CMakeLists.txt b/borrowed/gwengui-gtk3/CMakeLists.txt
index 1a5c559..31fa1f9 100644
--- a/borrowed/gwengui-gtk3/CMakeLists.txt
+++ b/borrowed/gwengui-gtk3/CMakeLists.txt
@@ -43,17 +43,20 @@ SET_DIST_LIST(gwengui_gtk3_DIST CMakeLists.txt
   ${gwengui_gtk3_EXTRA_DIST}
   )
 
-ADD_LIBRARY(gwengui-gtk3 ${gwengui_gtk3_SOURCES})
+if (WITH_AQBANKING AND NOT HAVE_GWEN_GTK3)
+    ADD_LIBRARY(gwengui-gtk3 ${gwengui_gtk3_SOURCES})
 
-TARGET_COMPILE_DEFINITIONS(gwengui-gtk3 PRIVATE BUILDING_GTK3_GUI=True)
-TARGET_INCLUDE_DIRECTORIES(gwengui-gtk3 PUBLIC
-  ${GTK3_INCLUDE_DIRS}
-  ${GWENHYWFAR_INCLUDE_DIRS}
-  )
-TARGET_LINK_LIBRARIES(gwengui-gtk3 ${GWENHYWFAR_LDFLAGS} ${GTK3_LDFLAGS})
+    TARGET_COMPILE_DEFINITIONS(gwengui-gtk3 PRIVATE BUILDING_GTK3_GUI=True)
+    TARGET_INCLUDE_DIRECTORIES(gwengui-gtk3 PUBLIC
+        ${GTK3_INCLUDE_DIRS}
+        ${GWENHYWFAR_INCLUDE_DIRS}
+    )
+    TARGET_LINK_LIBRARIES(gwengui-gtk3 ${GWENHYWFAR_LDFLAGS} ${GTK3_LDFLAGS})
 
-INSTALL(TARGETS gwengui-gtk3
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-  )
+    INSTALL(TARGETS gwengui-gtk3
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    )
+
+endif()



Summary of changes:
 borrowed/CMakeLists.txt              |  5 ++---
 borrowed/gwengui-gtk3/CMakeLists.txt | 27 +++++++++++++++------------
 2 files changed, 17 insertions(+), 15 deletions(-)