Skip to content
Snippets Groups Projects
Commit 82cd1f8b authored by dmitriy.gerasimov's avatar dmitriy.gerasimov
Browse files

Merge branch 'bugs-2611' into 'master'

[+] add parameter to include tests for dashboard

See merge request !32
parents 49446d51 af0d9a3c
No related branches found
No related tags found
1 merge request!32[+] add parameter to include tests for dashboard
Pipeline #1082 passed with stage
in 3 minutes and 7 seconds
TEMPLATE = subdirs TEMPLATE = subdirs
SUBDIRS = CellFrameDashboardGUI CellFrameDashboardService \ SUBDIRS = CellFrameDashboardGUI CellFrameDashboardService
CellFrameDashboardTests
CellFrameDashboardGUI.subdir = CellFrameDashboardGUI CellFrameDashboardGUI.subdir = CellFrameDashboardGUI
CellFrameDashboardService.subdir = CellFrameDashboardService CellFrameDashboardService.subdir = CellFrameDashboardService
...@@ -16,3 +15,8 @@ unix: !mac : !android { ...@@ -16,3 +15,8 @@ unix: !mac : !android {
share_target.path = /opt/cellframe-dashboard/share/ share_target.path = /opt/cellframe-dashboard/share/
INSTALLS += share_target INSTALLS += share_target
} }
BUILD_DASHBOARD_TESTS {
message(BUILD_DASHBOARD_TESTS enabled)
SUBDIRS += CellFrameDashboardTests
}
isEmpty(GOOGLETEST_DIR):GOOGLETEST_DIR=$$(GOOGLETEST_DIR) isEmpty(GOOGLETEST_DIR):GOOGLETEST_DIR=$$(GOOGLETEST_DIR)
message("_PRO_FILE_PWD_" = $$_PRO_FILE_PWD_/../../3dparty/googletest)
isEmpty(GOOGLETEST_DIR) { isEmpty(GOOGLETEST_DIR) {
warning("Using googletest src dir specified at Qt Creator wizard") 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") message("set GOOGLETEST_DIR as environment variable or qmake variable to get rid of this message")
......
#include "tst_settings.h"
#include <gtest/gtest.h> #include <gtest/gtest.h>
int main(int argc, char *argv[]) int main(int argc, char *argv[])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment