[Libreoffice-commits] core.git: 2 commits - desktop/CppunitTest_desktop_app.mk desktop/Library_sofficeapp.mk

[Michael Stahl]

 desktop/CppunitTest_desktop_app.mk |    2 ++
 desktop/Library_sofficeapp.mk      |    7 ++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 7127cba643e7b5e2abb7f8a875e2b74d4a89b7a2
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jul 19 14:25:14 2016 +0200

    desktop: simplify $(ENABLE_BREAKPAD) checks
    
    Change-Id: Ibe2da6214b1f6555922313b22e2882a2ddb4b9e7

diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index a5cf82b..2a3f142 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -24,15 +24,12 @@ $(eval $(call gb_Library_add_libs,sofficeapp,\
 ))
 
 $(eval $(call gb_Library_use_externals,sofficeapp, \
+	$(if $(ENABLE_BREAKPAD),breakpad) \
 	$(if $(filter OPENCL,$(BUILD_TYPE)),clew) \
     boost_headers \
     dbus \
 ))
 
-ifeq ($(ENABLE_BREAKPAD),TRUE)
-$(eval $(call gb_Library_use_external,sofficeapp,breakpad))
-endif
-
 $(eval $(call gb_Library_use_custom_headers,sofficeapp,\
 	officecfg/registry \
 ))
@@ -52,7 +49,7 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\
     comphelper \
     cppu \
     cppuhelper \
-    $(if $(filter TRUE,$(ENABLE_BREAKPAD)), \
+    $(if $(ENABLE_BREAKPAD), \
         crashreport \
     ) \
     deploymentmisc \
commit 017f6fcf35e3e7087a08ea01f112c6dcdf34eac1
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jul 19 14:23:19 2016 +0200

    desktop: CppunitTest_desktop_app requires breakpad
    
    Change-Id: I314fd2ba94ec6efdfecbc9694138a6410665163c

diff --git a/desktop/CppunitTest_desktop_app.mk b/desktop/CppunitTest_desktop_app.mk
index 317d63f..a51d270 100644
--- a/desktop/CppunitTest_desktop_app.mk
+++ b/desktop/CppunitTest_desktop_app.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,desktop_app, \
 ))
 
 $(eval $(call gb_CppunitTest_use_externals,desktop_app, \
+	$(if $(ENABLE_BREAKPAD),breakpad) \
     dbus \
 ))
 
@@ -21,6 +22,7 @@ $(eval $(call gb_CppunitTest_use_libraries,desktop_app, \
     comphelper \
     cppu \
     cppuhelper \
+    $(if $(ENABLE_BREAKPAD),crashreport) \
     deploymentmisc \
     editeng \
     i18nlangtag \