Subject: [PATCH] Use find_package. We remove all embedded 3rd-party libs like icu, libxml, libxslt and sqlite, and use libraries provided via guix inputs. --- .../web/src/main/native/Source/cmake/OptionsJava.cmake | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/web/src/main/native/Source/cmake/OptionsJava.cmake b/modules/web/src/main/native/Source/cmake/OptionsJava.cmake index 76a6695..73c525b 100644 --- a/modules/web/src/main/native/Source/cmake/OptionsJava.cmake +++ b/modules/web/src/main/native/Source/cmake/OptionsJava.cmake @@ -26,13 +26,11 @@ endif () set(LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "Absolute path to library installation directory") set(EXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_BINDIR}" CACHE PATH "Absolute path to executable installation directory") -set(SQLITE_LIBRARIES SqliteJava) -set(LIBXML2_LIBRARIES XMLJava) -set(LIBXSLT_LIBRARIES XSLTJava) -set(ICU_LIBRARIES icuuc icudata) -set(ICU_I18N_LIBRARIES icui18n icuuc icudata) -set(ICU_DATA_LIBRARIES icudata) +find_package(Sqlite REQUIRED) +find_package(LibXml2 REQUIRED) +find_package(LibXslt REQUIRED) +find_package(ICU REQUIRED) find_package(JNI REQUIRED) find_package(Threads REQUIRED) -- 2.26.2