[Libreoffice-commits] .: i18npool/CppunitTest_i18npool_test_textsearch.mk i18npool/Library_i18nsearch.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Nov 12 04:07:17 PST 2012


 i18npool/CppunitTest_i18npool_test_textsearch.mk |    2 +-
 i18npool/Library_i18nsearch.mk                   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 62336df8416ed13f62f7cfad4eb3b1b5c0249a9a
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Nov 12 14:02:01 2012 +0200

    The icui18n library is called icuin in a MSVC build for some reason
    
    Change-Id: I2fe03d438f52c31d0615f124f4d0a7ced2136928

diff --git a/i18npool/CppunitTest_i18npool_test_textsearch.mk b/i18npool/CppunitTest_i18npool_test_textsearch.mk
index 8331cbd..ddffaf0 100644
--- a/i18npool/CppunitTest_i18npool_test_textsearch.mk
+++ b/i18npool/CppunitTest_i18npool_test_textsearch.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_textsearch,\
 	cppuhelper \
 	sal \
 	icuuc \
-	icui18n \
+	$(if $(filter MSC,$(COM)),icuin,icui18n) \
 	unotest \
 	$(gb_UWINAPI) \
 ))
diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk
index 5778b13..2d5b463 100644
--- a/i18npool/Library_i18nsearch.mk
+++ b/i18npool/Library_i18nsearch.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_Library_use_libraries,i18nsearch,\
 	cppu \
 	cppuhelper \
 	icuuc \
-	icui18n \
+	$(if $(filter MSC,$(COM)),icuin,icui18n) \
 	sal \
 	$(gb_UWINAPI) \
 ))


More information about the Libreoffice-commits mailing list