[Libreoffice-commits] .: i18npool/CppunitTest_i18npool_test_textsearch.mk
i18npool/CppunitTest_i18npool_test_textsearch.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a2d6af3be3ce47abb77411dbc67c2180d9b0160b Author: Michael Meeks Date: Mon Nov 12 20:23:36 2012 + finally get the unit test name right; wow. diff --git a/i18npool/CppunitTest_i18npool_test_textsearch.mk b/i18npool/CppunitTest_i18npool_test_textsearch.mk index c826e65..b563ac1 100644 --- a/i18npool/CppunitTest_i18npool_test_textsearch.mk +++ b/i18npool/CppunitTest_i18npool_test_textsearch.mk @@ -25,7 +25,7 @@ $(eval $(call gb_CppunitTest_use_components,i18npool_test_textsearch,\ i18npool/util/i18npool \ )) -$(eval $(call gb_Library_use_externals,i18npool_test_textsearch,\ +$(eval $(call gb_CppunitTest_use_externals,i18npool_test_textsearch,\ $(if $(filter MSC,$(COM)),icuin,icui18n) \ icuuc \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/CppunitTest_i18npool_test_textsearch.mk
i18npool/CppunitTest_i18npool_test_textsearch.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7bbcbe0727e3eee2e1860e2a038d5bd2baf7d38c Author: Michael Meeks Date: Mon Nov 12 19:27:22 2012 + add the right icu externals to the right target. diff --git a/i18npool/CppunitTest_i18npool_test_textsearch.mk b/i18npool/CppunitTest_i18npool_test_textsearch.mk index 60626b2..c826e65 100644 --- a/i18npool/CppunitTest_i18npool_test_textsearch.mk +++ b/i18npool/CppunitTest_i18npool_test_textsearch.mk @@ -25,7 +25,7 @@ $(eval $(call gb_CppunitTest_use_components,i18npool_test_textsearch,\ i18npool/util/i18npool \ )) -$(eval $(call gb_Library_use_externals,i18nsearch,\ +$(eval $(call gb_Library_use_externals,i18npool_test_textsearch,\ $(if $(filter MSC,$(COM)),icuin,icui18n) \ icuuc \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/CppunitTest_i18npool_test_textsearch.mk
i18npool/CppunitTest_i18npool_test_textsearch.mk |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit c89602036aa127684e118b2606258201f1906152 Author: Michael Meeks Date: Mon Nov 12 16:36:32 2012 + fix identical issue in textsearch unit test. diff --git a/i18npool/CppunitTest_i18npool_test_textsearch.mk b/i18npool/CppunitTest_i18npool_test_textsearch.mk index ddffaf0..60626b2 100644 --- a/i18npool/CppunitTest_i18npool_test_textsearch.mk +++ b/i18npool/CppunitTest_i18npool_test_textsearch.mk @@ -25,12 +25,15 @@ $(eval $(call gb_CppunitTest_use_components,i18npool_test_textsearch,\ i18npool/util/i18npool \ )) +$(eval $(call gb_Library_use_externals,i18nsearch,\ + $(if $(filter MSC,$(COM)),icuin,icui18n) \ + icuuc \ +)) + $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_textsearch,\ cppu \ cppuhelper \ sal \ - icuuc \ - $(if $(filter MSC,$(COM)),icuin,icui18n) \ unotest \ $(gb_UWINAPI) \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/CppunitTest_i18npool_test_textsearch.mk i18npool/Library_i18nsearch.mk
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 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) \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
