diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-13 12:02:25 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-13 12:02:57 +0100 |
| commit | c057e0b712321bc2a9796ad3ef838ab008b3a722 (patch) | |
| tree | 1dac6afd8f266d38bbfb0eb08b19eaac3289fa06 /officecfg | |
| parent | efe694737e6c0822bb14a5dd52ad8148e38bb952 (diff) | |
Re-enable CppunitTest_officecfg_cppheader_test
Change-Id: I059a4cf6ce9f8969235cb998522461e82232502c
Diffstat (limited to 'officecfg')
| -rw-r--r-- | officecfg/CppunitTest_officecfg_cppheader_test.mk | 6 | ||||
| -rw-r--r-- | officecfg/Module_officecfg.mk | 11 |
2 files changed, 8 insertions, 9 deletions
diff --git a/officecfg/CppunitTest_officecfg_cppheader_test.mk b/officecfg/CppunitTest_officecfg_cppheader_test.mk index d0ddd2550144..e9aaf44bc1e3 100644 --- a/officecfg/CppunitTest_officecfg_cppheader_test.mk +++ b/officecfg/CppunitTest_officecfg_cppheader_test.mk @@ -13,7 +13,7 @@ $(eval $(call gb_CppunitTest_use_libraries,officecfg_cppheader_test,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppUnitTest_use_custom_headers,officecfg_cppheader_test,\ +$(eval $(call gb_CppunitTest_use_custom_headers,officecfg_cppheader_test,\ officecfg/registry \ )) @@ -25,4 +25,8 @@ $(eval $(call gb_CppunitTest_use_api,officecfg_cppheader_test, \ udkapi \ )) +$(eval $(call gb_CppunitTest_use_externals,officecfg_cppheader_test, \ + boost_headers \ +)) + # vim: set noet sw=4 ts=4: diff --git a/officecfg/Module_officecfg.mk b/officecfg/Module_officecfg.mk index 45002eb90220..326ae1580714 100644 --- a/officecfg/Module_officecfg.mk +++ b/officecfg/Module_officecfg.mk @@ -26,13 +26,8 @@ $(eval $(call gb_Module_add_targets,officecfg,\ Configuration_officecfg \ )) -# this does not work, subsequenttest s a runtime dep, that is it postpone the run of the unittest, not the build of it -# and that test need a bunch of include that are not there and there is no rule to teach make about the -# dependency of these generated headers -# disabled for now -# The cppheader test depends on comphelper so can only be a subsequentcheck: -#$(eval $(call gb_Module_add_subsequentcheck_targets,officecfg,\ -# CppunitTest_officecfg_cppheader_test \ -#)) +$(eval $(call gb_Module_add_check_targets,officecfg,\ + CppunitTest_officecfg_cppheader_test \ +)) # vim: set noet sw=4 ts=4: |