From c3a1355c346761a1e84d083a6de9b8e788e7124d Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Mon, 22 Feb 2016 14:31:55 +0100 Subject: [PATCH] UnitTests: Search for the google test in sibling directories too Change-Id: I7f9c82e7f4a38a422b1df272f874c3525dfacd32 Reviewed-by: Orgad Shaneh --- tests/unit/unittest/gmock_dependency.pri | 32 ++++++++++++++++++------ 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/tests/unit/unittest/gmock_dependency.pri b/tests/unit/unittest/gmock_dependency.pri index 76b35285188..0dbd28acbec 100644 --- a/tests/unit/unittest/gmock_dependency.pri +++ b/tests/unit/unittest/gmock_dependency.pri @@ -1,15 +1,31 @@ isEmpty(GOOGLETEST_DIR):GOOGLETEST_DIR=$$(GOOGLETEST_DIR) -isEmpty(GOOGLETEST_DIR):linux-* { - GTEST_INCLUDE_DIR = /usr/include/gtest - GMOCK_INCLUDE_DIR = /usr/include/gmock - GTEST_SRC_DIR = /usr/src/gtest - GMOCK_SRC_DIR = /usr/src/gmock -} else { - GTEST_INCLUDE_DIR = $$GOOGLETEST_DIR/googletest - GMOCK_INCLUDE_DIR = $$GOOGLETEST_DIR/googlemock + +defineTest(setGoogleTestDirectories) { + DIRECTORY = $$1 + GTEST_INCLUDE_DIR = $$DIRECTORY/googletest + GMOCK_INCLUDE_DIR = $$DIRECTORY/googlemock GTEST_SRC_DIR = $$GTEST_INCLUDE_DIR GMOCK_SRC_DIR = $$GMOCK_INCLUDE_DIR + export(GTEST_INCLUDE_DIR) + export(GMOCK_INCLUDE_DIR) + export(GTEST_SRC_DIR) + export(GMOCK_SRC_DIR) +} + +isEmpty(GOOGLETEST_DIR) { + exists($$PWD/../../../../googletest) { + setGoogleTestDirectories($$PWD/../../../../googletest) + } else: exists($$PWD/../../../../../googletest) { + setGoogleTestDirectories($$PWD/../../../../../googletest) + } else: linux { + GTEST_INCLUDE_DIR = /usr/include/gtest + GMOCK_INCLUDE_DIR = /usr/include/gmock + GTEST_SRC_DIR = /usr/src/gtest + GMOCK_SRC_DIR = /usr/src/gmock + } +} else { + setGoogleTestDirectories($$GOOGLETEST_DIR) } requires(exists($$GTEST_SRC_DIR):exists($$GMOCK_SRC_DIR))