Skip to content

Commit

Permalink
Bug 787497 - Disabling OFX, AqBanking or python-bindings support crip…
Browse files Browse the repository at this point in the history
…ples the dist build target
  • Loading branch information
gjanssens committed Feb 3, 2018
1 parent e6edb9d commit 56a58e6
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 15 deletions.
5 changes: 2 additions & 3 deletions borrowed/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
27 changes: 15 additions & 12 deletions borrowed/gwengui-gtk3/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

0 comments on commit 56a58e6

Please sign in to comment.