diff options
| -rw-r--r-- | installerfw.pro | 6 | ||||
| -rw-r--r-- | tests/tests.pro | 21 |
2 files changed, 7 insertions, 20 deletions
diff --git a/installerfw.pro b/installerfw.pro index 9eed1347f..f816aa82f 100644 --- a/installerfw.pro +++ b/installerfw.pro @@ -1,10 +1,14 @@ CONFIG += ordered TEMPLATE = subdirs -SUBDIRS += src tests tools +SUBDIRS += src tools include (installerfw.pri) include (doc/doc.pri) +BUILD_TESTS = $$(BUILDTESTS) +isEmpty(BUILD_TESTS):BUILD_TESTS=$${BUILDTESTS} +!isEmpty(BUILD_TESTS):SUBDIRS += tests + !minQtVersion(5, 3, 0) { message("Cannot build Qt Installer Framework with Qt version $${QT_VERSION}.") error("Use at least Qt 5.3.0.") diff --git a/tests/tests.pro b/tests/tests.pro index fc08c708b..1e8963ed2 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -1,24 +1,7 @@ CONFIG += ordered TEMPLATE = subdirs -SUBDIRS += auto -EXTRASUBDIRS = \ +SUBDIRS = \ + auto \ downloadspeed \ environmentvariable - -include(../installerfw.pri) - -!isEqual(IFW_SOURCE_TREE, $$IFW_BUILD_TREE) { - for(SUBDIR, EXTRASUBDIRS) { - mkdir.commands += $$QMAKE_MKDIR $$SUBDIR $${IFW_NEWLINE} - } - QMAKE_EXTRA_TARGETS += mkdir -} - -for(SUBDIR, EXTRASUBDIRS) { - tests.commands += cd $$SUBDIR && $(QMAKE) -r $$PWD/$$SUBDIR && $(MAKE) $${IFW_NEWLINE} -} -!isEqual(IFW_SOURCE_TREE, $$IFW_BUILD_TREE) { - tests.depends = mkdir -} -QMAKE_EXTRA_TARGETS *= tests |