From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Sat, 3 Jan 2015 19:36:31 +0000 (+0100)
Subject: Windows cmake cross compile fix
X-Git-Tag: dbus-1.8.16~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01af167b55ee1507212a6ec6c01027ae1b471ff3;p=thirdparty%2Fdbus.git

Windows cmake cross compile fix

We need to include 'test' subdir in any case not only when using glib.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=88009
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---

diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt
index 9195eae7f..ecad3046b 100644
--- a/cmake/test/CMakeLists.txt
+++ b/cmake/test/CMakeLists.txt
@@ -1,3 +1,4 @@
+include_directories(${CMAKE_SOURCE_DIR}/../test)
 
 add_definitions(${DBUS_INTERNAL_CLIENT_DEFINITIONS})
 
@@ -66,7 +67,6 @@ if(DBUS_WITH_GLIB)
     include_directories(
         ${GLIB2_INCLUDE_DIR}
         ${GOBJECT_INCLUDE_DIR}
-        ${CMAKE_SOURCE_DIR}/../test
     )
     set(TEST_LIBRARIES ${DBUS_INTERNAL_LIBRARIES} dbus-testutils ${GLIB2_LIBRARIES} ${GOBJECT_LIBRARIES})