From af0d9a3cb6487611640cae026862603288771589 Mon Sep 17 00:00:00 2001
From: Alexander <aleksandr.martynov@demlabs.net>
Date: Mon, 21 Oct 2019 11:42:43 -0400
Subject: [PATCH] [+] add parameter to include tests for dashboard
---
CellFrameDashboard.pro | 8 ++++++--
CellFrameDashboardTests/gtest_dependency.pri | 3 ---
CellFrameDashboardTests/main.cpp | 2 --
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/CellFrameDashboard.pro b/CellFrameDashboard.pro
index c8b3e54a3..3b7a918fd 100755
--- a/CellFrameDashboard.pro
+++ b/CellFrameDashboard.pro
@@ -1,6 +1,5 @@
TEMPLATE = subdirs
-SUBDIRS = CellFrameDashboardGUI CellFrameDashboardService \
- CellFrameDashboardTests
+SUBDIRS = CellFrameDashboardGUI CellFrameDashboardService
CellFrameDashboardGUI.subdir = CellFrameDashboardGUI
CellFrameDashboardService.subdir = CellFrameDashboardService
@@ -16,3 +15,8 @@ unix: !mac : !android {
share_target.path = /opt/cellframe-dashboard/share/
INSTALLS += share_target
}
+
+BUILD_DASHBOARD_TESTS {
+ message(BUILD_DASHBOARD_TESTS enabled)
+ SUBDIRS += CellFrameDashboardTests
+}
diff --git a/CellFrameDashboardTests/gtest_dependency.pri b/CellFrameDashboardTests/gtest_dependency.pri
index b51e665dd..de65828b6 100644
--- a/CellFrameDashboardTests/gtest_dependency.pri
+++ b/CellFrameDashboardTests/gtest_dependency.pri
@@ -1,8 +1,5 @@
isEmpty(GOOGLETEST_DIR):GOOGLETEST_DIR=$$(GOOGLETEST_DIR)
-message("_PRO_FILE_PWD_" = $$_PRO_FILE_PWD_/../../3dparty/googletest)
-
-
isEmpty(GOOGLETEST_DIR) {
warning("Using googletest src dir specified at Qt Creator wizard")
message("set GOOGLETEST_DIR as environment variable or qmake variable to get rid of this message")
diff --git a/CellFrameDashboardTests/main.cpp b/CellFrameDashboardTests/main.cpp
index 09bf49acd..899ed9fab 100644
--- a/CellFrameDashboardTests/main.cpp
+++ b/CellFrameDashboardTests/main.cpp
@@ -1,5 +1,3 @@
-#include "tst_settings.h"
-
#include <gtest/gtest.h>
int main(int argc, char *argv[])
--
GitLab