diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-07-15 22:20:50 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-07-15 23:07:14 +0200 |
| commit | d8b6225d974ef7f8dd14cf0828a86f6e9881fc97 (patch) | |
| tree | 2ca060397e1a540aa57e79cbf94b80c7c1946f12 | |
| parent | 111e10bd401b3fee981f32f5f98fc7512a5c47f8 (diff) | |
smoketest: fix build with MSVC:
Linking an empty CppunitTest against smoketest Library does not work,
the linker complains aboutunresolved external symbol DllMainCRTstartup
or something like that; building a static library has the same result;
so just build the cxx file twice via a dummy smoketest_too.cxx.
Change-Id: I11a29d4ec134f67a7de896ff8c669ed5b47782a7
| -rw-r--r-- | smoketest/CppunitTest_smoketest.mk | 9 | ||||
| -rw-r--r-- | smoketest/smoketest_too.cxx | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk index aa27bef2e773..b99c160dc844 100644 --- a/smoketest/CppunitTest_smoketest.mk +++ b/smoketest/CppunitTest_smoketest.mk @@ -29,13 +29,20 @@ $(eval $(call gb_CppunitTest_CppunitTest,smoketest)) $(eval $(call gb_CppunitTest_abort_on_assertion,smoketest)) +$(eval $(call gb_CppunitTest_add_exception_objects,smoketest,\ + smoketest/smoketest_too \ +)) + $(eval $(call gb_CppunitTest_use_api,smoketest,\ offapi \ udkapi \ )) $(eval $(call gb_CppunitTest_use_libraries,smoketest,\ - smoketest \ + cppu \ + cppuhelper \ + sal \ + unotest \ )) ifeq ($(OS),MACOSX) diff --git a/smoketest/smoketest_too.cxx b/smoketest/smoketest_too.cxx new file mode 100644 index 000000000000..67bd8f611645 --- /dev/null +++ b/smoketest/smoketest_too.cxx @@ -0,0 +1 @@ +#include <smoketest.cxx> |