diff options
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/CppunitTest_odk_checkapi.mk | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/odk/CppunitTest_odk_checkapi.mk b/odk/CppunitTest_odk_checkapi.mk index 00a799139f1f..22dad8cab62a 100644 --- a/odk/CppunitTest_odk_checkapi.mk +++ b/odk/CppunitTest_odk_checkapi.mk @@ -9,29 +9,33 @@ $(eval $(call gb_CppunitTest_CppunitTest,odk_checkapi)) -$(eval $(call gb_CppunitTest_use_custom_headers,odk_checkapi,\ - odk/allheaders \ -)) - $(eval $(call gb_CppunitTest_add_exception_objects,odk_checkapi,\ odk/qa/checkapi/checkapi \ )) -$(eval $(call gb_CppunitTest_use_internal_comprehensive_api,odk_checkapi,\ - udkapi \ -)) - $(eval $(call gb_CppunitTest_add_cxxflags,odk_checkapi,\ $(gb_CXX03FLAGS) \ )) -$(eval $(call gb_CppunitTest_use_libraries,odk_checkapi,\ - cppu \ - cppuhelper \ - sal \ - salhelper \ +$(eval $(call gb_CppunitTest_set_external_code,odk_checkapi)) + +# The remaining lines must be in the given order, to set up a set of include paths that only +# contains the instdir SDK include directory, plus SOLARINC as needed for platform-specific +# includes, plus the workdir sub-directory containing the generated allheaders.hxx and the workdir +# sub-directory containing the generated UNOIDL include files (which are not bundled in the SDK but +# would rather get created on demand by the SDK's makefiles), plus whatever is needed for CppUnit: + +$(eval $(call gb_CppunitTest_set_include,odk_checkapi, \ + -I$(INSTDIR)/$(SDKDIRNAME)/include $(SOLARINC))) + +$(eval $(call gb_CppunitTest_use_custom_headers,odk_checkapi,\ + odk/allheaders \ )) -$(eval $(call gb_CppunitTest_set_external_code,odk_checkapi)) +$(eval $(call gb_CppunitTest_use_internal_comprehensive_api,odk_checkapi,\ + udkapi \ +)) + +$(eval $(call gb_CppunitTest_use_external,odk_checkapi,cppunit)) # vim: set noet sw=4 ts=4: |