1
1
diff --git a/CMakeLists.txt b/CMakeLists.txt
2
- index c23fe75f..5cc294b2 100644
2
+ index ab3d0d24..f8dcd44d 100644
3
3
--- a/CMakeLists.txt
4
4
+++ b/CMakeLists.txt
5
- @@ -362 ,7 +362 ,7 @@ endif()
5
+ @@ -355 ,7 +355 ,7 @@ endif()
6
6
7
7
if(LIBXML2_WITH_ICU)
8
8
target_link_libraries(LibXml2 PRIVATE ICU::uc)
@@ -11,19 +11,19 @@ index c23fe75f..5cc294b2 100644
11
11
list(APPEND XML_PRIVATE_LIBS "${ICU_LDFLAGS}")
12
12
pkg_check_modules(ICU_PC IMPORTED_TARGET icu-uc)
13
13
if(ICU_PC_FOUND)
14
- @@ -417 ,7 +417 ,6 @@ set_target_properties(
14
+ @@ -411 ,7 +411 ,6 @@ set_target_properties(
15
15
IMPORT_PREFIX lib
16
16
OUTPUT_NAME xml2
17
17
POSITION_INDEPENDENT_CODE ON
18
18
- PREFIX lib
19
19
VERSION "${LIBXML_SOVERSION}.${LIBXML_AGE}.${LIBXML_MICRO_VERSION}"
20
20
SOVERSION ${LIBXML_SOVERSION}
21
- )
21
+ MACHO_COMPATIBILITY_VERSION ${LIBXML_MACHO_COMPAT}
22
22
diff --git a/encoding.c b/encoding.c
23
- index a90694f5..a0b9a9c1 100644
23
+ index 7dfd37aa..96c00a72 100644
24
24
--- a/encoding.c
25
25
+++ b/encoding.c
26
- @@ -48 ,7 +48 ,7 @@
26
+ @@ -47 ,7 +47 ,7 @@
27
27
#include "private/memory.h"
28
28
29
29
#ifdef LIBXML_ICU_ENABLED
@@ -33,10 +33,10 @@ index a90694f5..a0b9a9c1 100644
33
33
34
34
#define XML_HANDLER_STATIC (1 << 0)
35
35
diff --git a/libxml2-config.cmake.cmake.in b/libxml2-config.cmake.cmake.in
36
- index de084bdf..39d30622 100644
36
+ index ac15ded1..59121cc5 100644
37
37
--- a/libxml2-config.cmake.cmake.in
38
38
+++ b/libxml2-config.cmake.cmake.in
39
- @@ -124 ,7 +124 ,7 @@ if(NOT LIBXML2_SHARED)
39
+ @@ -122 ,7 +122 ,7 @@ if(NOT LIBXML2_SHARED)
40
40
endif()
41
41
42
42
if(LIBXML2_WITH_ICU)
@@ -46,18 +46,18 @@ index de084bdf..39d30622 100644
46
46
if(NOT ICU_FOUND)
47
47
set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE)
48
48
diff --git a/libxml2-config.cmake.in b/libxml2-config.cmake.in
49
- index 31036805..469d110b 100644
49
+ index b70eb1dd..78de2cb8 100644
50
50
--- a/libxml2-config.cmake.in
51
51
+++ b/libxml2-config.cmake.in
52
- @@ -76 ,9 +76 ,9 @@ if(LIBXML2_WITH_THREADS )
53
- endif()
52
+ @@ -75 ,9 +75 ,9 @@ if(NOT LIBXML2_SHARED )
53
+ endif()
54
54
55
- if(LIBXML2_WITH_ICU)
56
- - find_dependency(ICU COMPONENTS data i18n uc)
57
- + find_dependency(ICU COMPONENTS i18n uc)
58
- list(APPEND LIBXML2_LIBRARIES ${ICU_LIBRARIES})
59
- - list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:ICU::data>;\$<LINK_ONLY:ICU::i18n>;\$<LINK_ONLY:ICU::uc>")
60
- + list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:ICU::i18n>;\$<LINK_ONLY:ICU::uc>")
61
- if(NOT ICU_FOUND)
62
- set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE)
63
- set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "ICU dependency was not found")
55
+ if(LIBXML2_WITH_ICU)
56
+ - find_dependency(ICU COMPONENTS data i18n uc)
57
+ + find_dependency(ICU COMPONENTS i18n uc)
58
+ list(APPEND LIBXML2_LIBRARIES ${ICU_LIBRARIES})
59
+ - list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:ICU::data>;\$<LINK_ONLY:ICU::i18n>;\$<LINK_ONLY:ICU::uc>")
60
+ + list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:ICU::i18n>;\$<LINK_ONLY:ICU::uc>")
61
+ if(NOT ICU_FOUND)
62
+ set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE)
63
+ set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "ICU dependency was not found")
0 commit comments