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

Bug 799480 - Fails to build with ICU 76

Browse Source 
Use CMake find_package instead of pkg-config.
This commit is contained in:
John Ralls 2024-12-21 16:56:00 -08:00
parent a716cca439
commit 579eed1fac
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -561,8 +561,7 @@ get_filename_component(PERL_DIR ${PERL_EXECUTABLE} DIRECTORY)
find_program(POD2MAN_EXECUTABLE pod2man HINTS ${PERL_DIR}) find_program(POD2MAN_EXECUTABLE pod2man HINTS ${PERL_DIR})
#ICU #ICU
pkg_check_modules (ICU4C REQUIRED icu-uc) find_package(ICU REQUIRED COMPONENTS uc i18n)
pkg_check_modules (ICU4C_I18N REQUIRED icu-i18n)
pkg_check_modules (LIBSECRET libsecret-1>=0.18) pkg_check_modules (LIBSECRET libsecret-1>=0.18)
IF (LIBSECRET_FOUND) IF (LIBSECRET_FOUND)

2
gnucash/import-export/csv-imp/CMakeLists.txt
View File

@ -62,7 +62,7 @@ add_library(gnc-csv-import ${csv_import_noinst_HEADERS}
target_link_libraries( target_link_libraries(
gnc-csv-import gnc-csv-import
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${ICU4C_I18N_LDFLAGS} ${ICU_LIBRARIES}
gnc-generic-import gnc-generic-import
gnc-gnome-utils gnc-gnome-utils
gnc-app-utils gnc-app-utils

2
gnucash/import-export/test/CMakeLists.txt
View File

@ -49,7 +49,7 @@ set(gtest_import_backend_LIBS
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${GMODULE_LDFLAGS} ${GMODULE_LDFLAGS}
${GTHREAD_LDFLAGS} ${GTHREAD_LDFLAGS}
${ICU4C_I18N_LDFLAGS} ${ICU_LIBRARIES}
gmock gmock
gtest gtest
) )

2
libgnucash/engine/CMakeLists.txt
View File

@ -237,7 +237,7 @@ target_link_libraries(gnc-engine
gnc-core-utils gnc-core-utils
${Boost_DATE_TIME_LIBRARY} ${Boost_DATE_TIME_LIBRARY}
${Boost_REGEX_LIBRARY} ${Boost_REGEX_LIBRARY}
${ICU4C_I18N_LDFLAGS} ${ICU_LIBRARIES}
${REGEX_LDFLAGS} ${REGEX_LDFLAGS}
${GMODULE_LDFLAGS} ${GMODULE_LDFLAGS}
PkgConfig::GLIB2 PkgConfig::GLIB2

2
libgnucash/engine/test/CMakeLists.txt
View File

@ -91,7 +91,7 @@ set(gtest_qof_LIBS
${GOBJECT_LDFLAGS} ${GOBJECT_LDFLAGS}
${GMODULE_LDFLAGS} ${GMODULE_LDFLAGS}
${GTHREAD_LDFLAGS} ${GTHREAD_LDFLAGS}
${ICU4C_I18N_LDFLAGS} ${ICU_LIBRARIES}
${Boost_LIBRARIES} ${Boost_LIBRARIES}
gtest) gtest)