mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
core-utils - rework link_libraries and include_directories propagation
By properly marking certain parameters as private or public we can have cmake work out most of the link_libraries and include_directoris for other targets dependent on core-utils
This commit is contained in:
@@ -22,23 +22,20 @@ add_dependencies(gnucash-guile
|
|||||||
swig-runtime-h)
|
swig-runtime-h)
|
||||||
|
|
||||||
target_include_directories(gnucash-guile
|
target_include_directories(gnucash-guile
|
||||||
PRIVATE
|
|
||||||
${CMAKE_SOURCE_DIR}/common
|
|
||||||
${CMAKE_BINARY_DIR}/common
|
|
||||||
${CMAKE_SOURCE_DIR}/libgnucash/core-utils
|
|
||||||
${CMAKE_BINARY_DIR}/libgnucash/core-utils # For gnc-version-info.h
|
|
||||||
${GLIB2_INCLUDE_DIRS}
|
|
||||||
${GTK_MAC_INCLUDE_DIRS}
|
|
||||||
PUBLIC
|
PUBLIC
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}
|
${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
${GUILE_INCLUDE_DIRS})
|
${GUILE_INCLUDE_DIRS}
|
||||||
|
${GLIB2_INCLUDE_DIRS}
|
||||||
|
PRIVATE
|
||||||
|
${CMAKE_SOURCE_DIR}/common
|
||||||
|
${CMAKE_BINARY_DIR}/common)
|
||||||
|
|
||||||
target_link_libraries(gnucash-guile
|
target_link_libraries(gnucash-guile
|
||||||
gnc-core-utils
|
PUBLIC
|
||||||
${GUILE_LDFLAGS}
|
${GUILE_LDFLAGS}
|
||||||
${GLIB2_LDFLAGS}
|
PRIVATE
|
||||||
${GOBJECT_LDFLAGS}
|
gnc-core-utils
|
||||||
${GTK_MAC_LDFLAGS})
|
${GLIB2_LDFLAGS})
|
||||||
|
|
||||||
install(TARGETS gnucash-guile
|
install(TARGETS gnucash-guile
|
||||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||||
|
|||||||
@@ -146,6 +146,7 @@ target_link_libraries(gnc-gnome
|
|||||||
gncmod-gnome-utils
|
gncmod-gnome-utils
|
||||||
gncmod-engine
|
gncmod-engine
|
||||||
gnucash-guile
|
gnucash-guile
|
||||||
|
${Boost_LIBRARIES}
|
||||||
PkgConfig::GTK3
|
PkgConfig::GTK3
|
||||||
${GTK_MAC_LDFLAGS})
|
${GTK_MAC_LDFLAGS})
|
||||||
|
|
||||||
|
|||||||
@@ -47,9 +47,11 @@ target_include_directories(gnc-core-utils
|
|||||||
${CMAKE_CURRENT_BINARY_DIR}
|
${CMAKE_CURRENT_BINARY_DIR}
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}
|
${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
${GLIB2_INCLUDE_DIRS}
|
${GLIB2_INCLUDE_DIRS}
|
||||||
|
PRIVATE
|
||||||
${GTK_MAC_INCLUDE_DIRS})
|
${GTK_MAC_INCLUDE_DIRS})
|
||||||
|
|
||||||
target_link_libraries(gnc-core-utils
|
target_link_libraries(gnc-core-utils
|
||||||
|
PRIVATE
|
||||||
${Boost_LIBRARIES}
|
${Boost_LIBRARIES}
|
||||||
${GLIB2_LDFLAGS}
|
${GLIB2_LDFLAGS}
|
||||||
${GOBJECT_LDFLAGS}
|
${GOBJECT_LDFLAGS}
|
||||||
|
|||||||
Reference in New Issue
Block a user