Bug 799480 - Fails to build with ICU 76

Use CMake find_package instead of pkg-config.
Gnucash · Dec 22, 2024 · 579eed1 · 579eed1
1 parent a716cca
commit 579eed1
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -561,8 +561,7 @@ get_filename_component(PERL_DIR ${PERL_EXECUTABLE} DIRECTORY)
 find_program(POD2MAN_EXECUTABLE pod2man HINTS ${PERL_DIR})
 
 #ICU
-pkg_check_modules (ICU4C REQUIRED icu-uc)
-pkg_check_modules (ICU4C_I18N REQUIRED icu-i18n)
+find_package(ICU REQUIRED COMPONENTS uc i18n)
 
 pkg_check_modules (LIBSECRET libsecret-1>=0.18)
 IF (LIBSECRET_FOUND)

diff --git a/gnucash/import-export/csv-imp/CMakeLists.txt b/gnucash/import-export/csv-imp/CMakeLists.txt
@@ -62,7 +62,7 @@ add_library(gnc-csv-import ${csv_import_noinst_HEADERS}
 target_link_libraries(
   gnc-csv-import
   ${Boost_LIBRARIES}
-  ${ICU4C_I18N_LDFLAGS}
+  ${ICU_LIBRARIES}
   gnc-generic-import
   gnc-gnome-utils
   gnc-app-utils

diff --git a/gnucash/import-export/test/CMakeLists.txt b/gnucash/import-export/test/CMakeLists.txt
@@ -49,7 +49,7 @@ set(gtest_import_backend_LIBS
   ${Boost_LIBRARIES}
   ${GMODULE_LDFLAGS}
   ${GTHREAD_LDFLAGS}
-  ${ICU4C_I18N_LDFLAGS}
+  ${ICU_LIBRARIES}
   gmock
   gtest
 )

diff --git a/libgnucash/engine/CMakeLists.txt b/libgnucash/engine/CMakeLists.txt
@@ -237,7 +237,7 @@ target_link_libraries(gnc-engine
     gnc-core-utils
     ${Boost_DATE_TIME_LIBRARY}
     ${Boost_REGEX_LIBRARY}
-    ${ICU4C_I18N_LDFLAGS}
+    ${ICU_LIBRARIES}
     ${REGEX_LDFLAGS}
     ${GMODULE_LDFLAGS}
     PkgConfig::GLIB2

diff --git a/libgnucash/engine/test/CMakeLists.txt b/libgnucash/engine/test/CMakeLists.txt
@@ -91,7 +91,7 @@ set(gtest_qof_LIBS
   ${GOBJECT_LDFLAGS}
   ${GMODULE_LDFLAGS}
   ${GTHREAD_LDFLAGS}
-  ${ICU4C_I18N_LDFLAGS}
+  ${ICU_LIBRARIES}
   ${Boost_LIBRARIES}
   gtest)