[Libreoffice-commits] core.git: officecfg/CppunitTest_officecfg_cppheader_test.mk officecfg/Module_officecfg.mk

[Stephan Bergmann]

 officecfg/CppunitTest_officecfg_cppheader_test.mk |    6 +++++-
 officecfg/Module_officecfg.mk                     |   11 +++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit c057e0b712321bc2a9796ad3ef838ab008b3a722
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Nov 13 12:02:25 2015 +0100

    Re-enable CppunitTest_officecfg_cppheader_test
    
    Change-Id: I059a4cf6ce9f8969235cb998522461e82232502c

diff --git a/officecfg/CppunitTest_officecfg_cppheader_test.mk b/officecfg/CppunitTest_officecfg_cppheader_test.mk
index d0ddd25..e9aaf44 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 45002eb..326ae15 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: