diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 16:34:46 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 16:39:43 +0100 |
| commit | 86ba184394094c7c043a505a20a0b1b8977f73d7 (patch) | |
| tree | 97479111778906db083c6b3ffe137d25f7ad3cfb /odk | |
| parent | 1cd9420755dc5d5435bf564a992b727c455a3d73 (diff) | |
Introduce gb_*_set_external_code
...to harmonize the mechanisms to not define LIBO_INTERNAL_ONLY for extension
code and CppunitTest_odk_checkapi. (It also needs to revert any -Wundef, as the
config_host/config_*.h files will not be included, so the HAVE_* macros will be
undefined.)
This obsoletes the need for RTL_DISABLE_FAST_STRING.
Change-Id: If5eacba80c349efb90762aade8f2ea6d2db7e314
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/CppunitTest_odk_checkapi.mk | 3 | ||||
| -rw-r--r-- | odk/qa/checkapi/checkapi.cxx | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/odk/CppunitTest_odk_checkapi.mk b/odk/CppunitTest_odk_checkapi.mk index 8d2bf2fde882..3c4581477052 100644 --- a/odk/CppunitTest_odk_checkapi.mk +++ b/odk/CppunitTest_odk_checkapi.mk @@ -26,7 +26,6 @@ $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,odk_checkapi,\ $(eval $(call gb_CppunitTest_disable_compiler_plugins,odk_checkapi)) $(eval $(call gb_CppunitTest_add_cxxflags,odk_checkapi,\ - $(gb_CXXFLAGS_Wundef) \ $(gb_CXX03FLAGS) \ )) @@ -38,4 +37,6 @@ $(eval $(call gb_CppunitTest_use_libraries,odk_checkapi,\ $(gb_UWINAPI) \ )) +$(eval $(call gb_CppunitTest_set_external_code,odk_checkapi)) + # vim: set noet sw=4 ts=4: diff --git a/odk/qa/checkapi/checkapi.cxx b/odk/qa/checkapi/checkapi.cxx index 67e11c6b2ea6..c76b4feec373 100644 --- a/odk/qa/checkapi/checkapi.cxx +++ b/odk/qa/checkapi/checkapi.cxx @@ -8,7 +8,9 @@ */ // Acts as if building outside of LO. -#undef LIBO_INTERNAL_ONLY +#ifdef LIBO_INTERNAL_ONLY +#error Build system problem, LIBO_INTERNAL_ONLY should not be set here. +#endif // The whole purpose of this test is to check that public API headers // build even without RTL_USING (which enables using e.g. rtl::OUString @@ -17,7 +19,7 @@ // for uses of such types. #ifdef RTL_USING -#error Build system problem, RTL_USING using should not be set here. +#error Build system problem, RTL_USING should not be set here. #endif // Additionally, check that public API headers build also with C++03. |