[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - desktop/CppunitTest_desktop_lib.mk desktop/qa

[Miklos Vajna]

 desktop/CppunitTest_desktop_lib.mk          |    5 +++++
 desktop/qa/desktop_lib/test_desktop_lib.cxx |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 2c0e7371e5c353d803d87b96328ea92f2c6a3216
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Apr 7 08:43:14 2016 +0200

    CppunitTest_desktop_lib: avoid #include "../..." style include
    
    Change-Id: Ib5ce0dee00c9306f89ad4b43af4b34e604147a1c
    (cherry picked from commit 04216006ee038232067bcf74d67b14e8918063f2)
    Reviewed-on: https://gerrit.libreoffice.org/24728
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/desktop/CppunitTest_desktop_lib.mk b/desktop/CppunitTest_desktop_lib.mk
index bbedfdc..b6226fa 100644
--- a/desktop/CppunitTest_desktop_lib.mk
+++ b/desktop/CppunitTest_desktop_lib.mk
@@ -33,6 +33,11 @@ $(eval $(call gb_CppunitTest_use_libraries,desktop_lib, \
 
 $(eval $(call gb_CppunitTest_use_external,desktop_lib,boost_headers))
 
+$(eval $(call gb_CppunitTest_set_include,desktop_lib,\
+    -I$(SRCDIR)/desktop/inc \
+    $$(INCLUDE) \
+))
+
 $(eval $(call gb_CppunitTest_use_api,desktop_lib,\
 	offapi \
 	udkapi \
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index a7d07af..bd37094 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -38,7 +38,7 @@
 #include <unotools/tempfile.hxx>
 #include <vcl/svapp.hxx>
 
-#include "../../inc/lib/init.hxx"
+#include <lib/init.hxx>
 
 using namespace com::sun::star;
 using namespace desktop;