cppunit-optional

Gbp-Pq: Name cppunit-optional.diff

diff --git a/config_host.mk.in b/config_host.mk.in
index e21cb4f219368557e4e6b7431e3273bbf25bbb8e..ba4901275df99095e05907bb5b6e8500e0bd3bcb 100644 (file)
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -115,6 +115,7 @@ export SYSTEM_COINMP=@SYSTEM_COINMP@
 export COINMP_CFLAGS=@COINMP_CFLAGS@
 export COINMP_LIBS=@COINMP_LIBS@
 export ENABLE_COLLADA=@ENABLE_COLLADA@
+export ENABLE_CPPUNIT=@ENABLE_CPPUNIT@
 export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
 export ENABLE_CUPS=@ENABLE_CUPS@
 export ENABLE_CURL=@ENABLE_CURL@

diff --git a/configure.ac b/configure.ac
index edc4400a067a6dc37da017b60a6aa30fbd3fb014..03864f38347a16cd4cc5705593f7b9b941a6e93f 100644 (file)
Binary files a/configure.ac and b/configure.ac differ

diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index fe9523a7a6e2156f949e753fc90996cec68576a8..719edf8c6252da64af1e5102e9372159e8a5b541 100644 (file)
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_Module_Module,sal))
 
 $(eval $(call gb_Module_add_targets,sal,\
-       $(if $(CROSS_COMPILING),,$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,Executable_cppunittester)) \
        $(if $(filter $(OS),ANDROID), \
                Library_lo-bootstrap) \
        Library_sal \
@@ -33,4 +32,10 @@ $(eval $(call gb_Module_add_check_targets,sal,\
 
 endif
 
+ifeq ($(ENABLE_CPPUNIT),TRUE)
+$(eval $(call gb_Module_add_check_targets,sal,\
+       $(if $(CROSS_COMPILING),,$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,Executable_cppunittester)) \
+))
+endif
+
 # vim: set noet sw=4 ts=4:

diff --git a/sdext/Executable_pdf2xml.mk b/sdext/Executable_pdf2xml.mk
index 373f40da36fdb5f0a46f8e5fd266870951fe158c..c0401bef9c7afec35a2aa40779c28acd6bcb35af 100644 (file)
--- a/sdext/Executable_pdf2xml.mk
+++ b/sdext/Executable_pdf2xml.mk
@@ -13,10 +13,10 @@ $(eval $(call gb_Executable_use_sdk_api,pdf2xml))
 
 $(eval $(call gb_Executable_use_externals,pdf2xml,\
     boost_headers \
-    cppunit \
     zlib \
 ))
 
+
 $(eval $(call gb_Executable_set_include,pdf2xml,\
     -I$(SRCDIR)/sdext/source/pdfimport/inc \
     $$(INCLUDE) \
@@ -27,11 +27,19 @@ $(eval $(call gb_Executable_use_libraries,pdf2xml,\
     vcl \
     comphelper \
     cppu \
-    unotest \
     cppuhelper \
     sal \
 ))
 
+ifeq ($(ENABLE_CPPUNIT),TRUE)
+$(eval $(call gb_Executable_use_externals,pdf2xml,\
+    cppunit \
+))
+$(eval $(call gb_Executable_use_libraries,pdf2xml,\
+    unotest \
+))
+endif
+
 $(eval $(call gb_Executable_use_library_objects,pdf2xml,pdfimport))
 
 $(eval $(call gb_Executable_add_exception_objects,pdf2xml,\

diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk
index 7e8b6d5f11f609f66470dd2aae628e2e26a13bb5..a084e254bf70a42df3a145e48702b4be0aac2ab4 100644 (file)
--- a/smoketest/Module_smoketest.mk
+++ b/smoketest/Module_smoketest.mk
@@ -12,6 +12,8 @@ $(eval $(call gb_Module_Module,smoketest))
 
 ifeq ($(CROSS_COMPILING),)
 
+ifeq ($(ENABLE_CPPUNIT),TRUE)
+
 $(eval $(call gb_Module_add_targets,smoketest,\
        Library_smoketest \
        Zip_smoketestdoc \
@@ -42,6 +44,8 @@ endif
 
 endif
 
+endif
+
 ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,smoketest,\
        Jar_smoketest \

diff --git a/test/Module_test.mk b/test/Module_test.mk
index e1051f16b5a06910e3f91e7cb43113c3f0e2e572..d1787cb5789bd605691a7a6d10203ad3963473b8 100644 (file)
--- a/test/Module_test.mk
+++ b/test/Module_test.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,test))
 
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 
+ifeq ($(ENABLE_CPPUNIT),TRUE)
 $(eval $(call gb_Module_add_targets,test,\
     Library_test \
     Library_test_setupvcl \
@@ -18,6 +19,7 @@ $(eval $(call gb_Module_add_targets,test,\
     Library_vclbootstrapprotector \
     Package_unittest \
 ))
+endif
 
 endif
 

diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index a1b84e175b30819e6dc993dca324b4bcd9fd3606..08e4aad24c1156947b7744fcc50f0315ea496481 100644 (file)
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_Module_Module,testtools))
 
 ifeq ($(CROSS_COMPILING),)
 
+ifeq ($(ENABLE_CPPUNIT),TRUE)
+
 $(eval $(call gb_Module_add_targets,testtools,\
        CustomTarget_bridgetest \
        InternalUnoApi_bridgetest \
@@ -41,4 +43,6 @@ $(eval $(call gb_Module_add_check_targets,testtools,\
 
 endif
 
+endif
+
 # vim:set noet sw=4 ts=4:

diff --git a/unotest/Module_unotest.mk b/unotest/Module_unotest.mk
index a47ca5d4b6949d144b84a2b5529f8eab7c3c8fdd..e243e06309f55e9c84c2f7b284c05084e7a12d0b 100644 (file)
--- a/unotest/Module_unotest.mk
+++ b/unotest/Module_unotest.mk
@@ -11,12 +11,15 @@
 $(eval $(call gb_Module_Module,unotest))
 
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+
+ifeq ($(ENABLE_CPPUNIT),TRUE)
 $(eval $(call gb_Module_add_targets,unotest,\
        Library_unobootstrapprotector \
        Library_unoexceptionprotector \
        Library_unotest \
 ))
 endif
+endif
 
 ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,unotest,\

diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk
index 0b862086f5a9a46a5618dbfe000ae50afa39c787..4bbfacf564f882ee98aa638043ed864068914918 100644 (file)
--- a/writerperfect/Module_writerperfect.mk
+++ b/writerperfect/Module_writerperfect.mk
@@ -43,7 +43,12 @@ $(eval $(call gb_Module_add_slowcheck_targets,writerperfect,\
        CppunitTest_writerperfect_import \
        CppunitTest_writerperfect_impress \
        CppunitTest_writerperfect_writer \
+))
+
+ifeq ($(ENABLE_CPPUNIT),TRUE)
+$(eval $(call gb_Module_add_slowcheck_targets,writerperfect,\
        Library_wpftqahelper \
 ))
+endif
 
 # vim: set noet sw=4 ts=4: