Skip to content

Commit cc6cbed

Browse files
committed
aaa
1 parent 45d0160 commit cc6cbed

File tree

1 file changed

+38
-8
lines changed

1 file changed

+38
-8
lines changed

depends/common/libxml2/0003-fix_cmakelist.patch

+38-8
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,42 @@
1-
From 354c9094761d24fe6fbed516541d501cb3446b3e Mon Sep 17 00:00:00 2001
1+
From 2faacbba4ed8fe742ed1cb2cd1cfe37b9ab7a447 Mon Sep 17 00:00:00 2001
22
From: Alwin Esch <[email protected]>
3-
Date: Sun, 24 Mar 2024 15:52:48 +0100
3+
Date: Sun, 24 Mar 2024 16:31:23 +0100
44
Subject: [PATCH 3/3] fix_cmakelist
55

66
---
7-
CMakeLists.txt | 14 +++++++++-----
8-
1 file changed, 9 insertions(+), 5 deletions(-)
7+
CMakeLists.txt | 34 ++++++++++++----------------------
8+
1 file changed, 12 insertions(+), 22 deletions(-)
99

1010
diff --git a/CMakeLists.txt b/CMakeLists.txt
11-
index 85bcab3..38d022a 100644
11+
index 85bcab3..e5de6ca 100644
1212
--- a/CMakeLists.txt
1313
+++ b/CMakeLists.txt
14-
@@ -609,12 +609,12 @@ endif()
14+
@@ -459,22 +459,8 @@ set_target_properties(
15+
)
16+
17+
if(MSVC)
18+
- if(BUILD_SHARED_LIBS)
19+
- set_target_properties(
20+
- LibXml2
21+
- PROPERTIES
22+
- DEBUG_POSTFIX d
23+
- )
24+
- else()
25+
- set_target_properties(
26+
- LibXml2
27+
- PROPERTIES
28+
- DEBUG_POSTFIX sd
29+
- MINSIZEREL_POSTFIX s
30+
- RELEASE_POSTFIX s
31+
- RELWITHDEBINFO_POSTFIX s
32+
- )
33+
- endif()
34+
+ add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
35+
+ add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
36+
endif()
37+
38+
install(FILES ${LIBXML2_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libxml2/libxml COMPONENT development)
39+
@@ -609,30 +595,30 @@ endif()
1540

1641
configure_package_config_file(
1742
libxml2-config.cmake.cmake.in libxml2-config.cmake
@@ -26,7 +51,12 @@ index 85bcab3..38d022a 100644
2651
COMPONENT development
2752
)
2853

29-
@@ -626,13 +626,13 @@ write_basic_package_version_file(
54+
write_basic_package_version_file(
55+
${CMAKE_CURRENT_BINARY_DIR}/libxml2-config-version.cmake
56+
VERSION ${PROJECT_VERSION}
57+
- COMPATIBILITY ExactVersion
58+
+ COMPATIBILITY SameMinorVersion
59+
)
3060

3161
install(
3262
FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config-version.cmake
@@ -42,7 +72,7 @@ index 85bcab3..38d022a 100644
4272
NAMESPACE LibXml2::
4373
FILE libxml2-export.cmake
4474
COMPONENT development
45-
@@ -663,7 +663,11 @@ list(JOIN XML_PRIVATE_LIBS " " XML_PRIVATE_LIBS)
75+
@@ -663,7 +649,11 @@ list(JOIN XML_PRIVATE_LIBS " " XML_PRIVATE_LIBS)
4676

4777
set(XML_INCLUDEDIR "-I\${includedir}/libxml2")
4878
set(XML_LIBDIR "-L\${libdir}")

0 commit comments

Comments
 (0)