IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Convert GtkMacIntegration to package-style dependencies.

Browse Source
This commit is contained in:
John Ralls 2019-09-15 12:27:25 -07:00
parent ecbc4864de
commit 6753b30b86
7 changed files with 15 additions and 13 deletions

2
CMakeLists.txt
View File

@ -403,7 +403,7 @@ if(APPLE)
if(TARGET_RESULT STREQUAL "quartz")
set(GNC_PLATFORM_COCOA 1)
set(GDK_QUARTZ 1)
pkg_check_modules(GTK_MAC gtk-mac-integration-gtk3)
pkg_check_modules(GTK_MAC IMPORTED_TARGET gtk-mac-integration-gtk3)
if (GTK_MAC_FOUND)
set(MAC_INTEGRATION 1)
find_library(COCOA_LIBRARY Cocoa)

3
gnucash/CMakeLists.txt
View File

@ -53,7 +53,8 @@ endif (BUILDING_FROM_VCS)
target_link_libraries (gnucash
gncmod-ledger-core gnc-gnome gncmod-gnome-utils gncmod-app-utils
gncmod-engine gnc-module gnc-core-utils gncmod-report
PkgConfig::GLIB2 PkgConfig::GTK3 PkgConfig::GUILE ${GTK_MAC_LDFLAGS}
PkgConfig::GLIB2 PkgConfig::GTK3 PkgConfig::GUILE
$<$<BOOL:${GTK_MAC_FOUND}>:PkgConfig::GTK_MAC>
)
# Get glib executable for generating the gresource file

6
gnucash/gnome-utils/CMakeLists.txt
View File

@ -203,8 +203,9 @@ add_library (gncmod-gnome-utils
)
target_link_libraries(gncmod-gnome-utils gncmod-app-utils gncmod-engine
gnc-backend-xml-utils PkgConfig::GTK3 ${CMAKE_DL_LIBS} $<$<BOOL:${LIBSECRET_FOUND}>:PkgConfig::LIBSECRET>
${GTK_MAC_LDFLAGS})
gnc-backend-xml-utils PkgConfig::GTK3 ${CMAKE_DL_LIBS}
$<$<BOOL:${LIBSECRET_FOUND}>:PkgConfig::LIBSECRET>
$<$<BOOL:${GTK_MAC_FOUND}>:PkgConfig::GTK_MAC>)
target_compile_options(gncmod-gnome-utils PRIVATE -Wno-deprecated-declarations)
target_compile_definitions(gncmod-gnome-utils PUBLIC ${GTK_MAC_CFLAGS_OTHER}
@ -223,7 +224,6 @@ target_include_directories(gncmod-gnome-utils
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
PRIVATE
${GTK_MAC_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
)

7
gnucash/gnome/CMakeLists.txt
View File

@ -136,8 +136,10 @@ 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 PkgConfig::GTK3
$<$<BOOL:${GTK_MAC_FOUND}>:PkgConfig::GTK_MAC>)
target_compile_definitions (gnc-gnome PRIVATE -DG_LOG_DOMAIN=\"gnc.gui\" ${GTK_MAC_CFLAGS_OTHER})
target_compile_options(gnc-gnome PRIVATE -Wno-deprecated-declarations)
@ -148,7 +150,6 @@ target_include_directories(gnc-gnome
${CMAKE_SOURCE_DIR}/libgnucash/app-utils/calculation
${CMAKE_SOURCE_DIR}/gnucash/html
${CMAKE_BINARY_DIR}/gnucash/gnome-utils # for gnc-warnings.h
${GTK_MAC_INCLUDE_DIRS}
)
add_dependencies (gnc-gnome swig-runtime-h)

7
libgnucash/core-utils/CMakeLists.txt
View File

@ -95,14 +95,15 @@ set(core_utils_noinst_HEADERS
)
set(core_utils_ALL_SOURCES ${core_utils_SOURCES} ${core_utils_noinst_HEADERS})
set(core_utils_ALL_LIBRARIES Boost::regex Boost::locale Boost::filesystem PkgConfig::GUILE PkgConfig::GLIB2 PkgConfig::GOBJECT ${GTK_MAC_LDFLAGS})
set(core_utils_ALL_LIBRARIES Boost::regex Boost::locale Boost::filesystem
PkgConfig::GUILE PkgConfig::GLIB2 PkgConfig::GOBJECT
$<$<BOOL:${GTK_MAC_FOUND}>:PkgConfig::GTK_MAC>)
set(core_utils_ALL_INCLUDES
${CMAKE_SOURCE_DIR}/common
${CMAKE_BINARY_DIR}/common
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${GTK_MAC_INCLUDE_DIRS})
)
set_local_dist(core_utils_DIST_local ${core_utils_ALL_SOURCES} CMakeLists.txt core-utils.i core-utils.scm gncla-dir.h.in)
set(core_utils_DIST ${core_utils_DIST_local} ${test_core_utils_DIST} PARENT_SCOPE)

1
libgnucash/core-utils/test/CMakeLists.txt
View File

@ -4,7 +4,6 @@ set(CORE_UTILS_TEST_INCLUDE_DIRS
${CMAKE_BINARY_DIR}/common # for config.h
${MODULEPATH}
${CMAKE_SOURCE_DIR}/common/test-core
${GTK_MAC_INCLUDE_DIRS}
)
set(CORE_UTILS_TEST_LIBS gnc-core-utils test-core)
if (MAC_INTEGRATION)

2
libgnucash/engine/CMakeLists.txt
View File

@ -238,7 +238,7 @@ else()
endif()
target_link_libraries(gncmod-engine gnc-core-utils gnc-module
Boost::date_time Boost::regex ICU::i18n
Boost::date_time Boost::regex ICU::i18n ICU::uc
${BCRYPT} ${REGEX_LDFLAGS} PkgConfig::GMODULE PkgConfig::GLIB2
PkgConfig::GOBJECT PkgConfig::GUILE)