-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
17 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,28 @@ | ||
From 2faacbba4ed8fe742ed1cb2cd1cfe37b9ab7a447 Mon Sep 17 00:00:00 2001 | ||
From 7bdffd9cb9f4bd43264ce69336d2d9238ce348ff Mon Sep 17 00:00:00 2001 | ||
From: Alwin Esch <[email protected]> | ||
Date: Sun, 24 Mar 2024 16:31:23 +0100 | ||
Date: Sun, 24 Mar 2024 17:14:20 +0100 | ||
Subject: [PATCH 3/3] fix_cmakelist | ||
|
||
--- | ||
CMakeLists.txt | 34 ++++++++++++---------------------- | ||
1 file changed, 12 insertions(+), 22 deletions(-) | ||
CMakeLists.txt | 38 ++++++++++++++------------------------ | ||
1 file changed, 14 insertions(+), 24 deletions(-) | ||
|
||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 85bcab3..e5de6ca 100644 | ||
index 85bcab3..0ae544d 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -390,9 +390,9 @@ endif() | ||
if(LIBXML2_WITH_ICU) | ||
target_link_libraries(LibXml2 PRIVATE ICU::data ICU::i18n ICU::uc) | ||
if(WIN32) | ||
- set(ICU_LDFLAGS "-licudt -licuin -licuuc") | ||
+ set(ICU_LIBS "icu-i18n") | ||
else() | ||
- set(ICU_LDFLAGS "-licudata -licui18n -licuuc") | ||
+ set(ICU_LIBS "icu-i18n") | ||
endif() | ||
list(APPEND XML_PRIVATE_LIBS "${ICU_LDFLAGS}") | ||
pkg_check_modules(ICU_PC IMPORTED_TARGET icu-i18n) | ||
@@ -459,22 +459,8 @@ set_target_properties( | ||
) | ||
|
||
|