Switched to C++-14
This commit is contained in:
parent
10f8f46ca6
commit
5f0b3734cf
3 changed files with 5 additions and 3 deletions
4
Makefile
4
Makefile
|
@ -43,9 +43,9 @@ testscheck:
|
||||||
|
|
||||||
tests:build
|
tests:build
|
||||||
ifdef TESTCASE
|
ifdef TESTCASE
|
||||||
LD_LIBRARY_PATH=$(LIBRARY_PATH) ${RUNNER} ${BUILDPATH}/tests/paysages-tests --gtest_filter=$(TESTCASE).*
|
LD_LIBRARY_PATH=$(LIBRARY_PATH) ${RUNNER} ${BUILDPATH}/tests/paysages-tests $(ARGS) --gtest_filter=$(TESTCASE).*
|
||||||
else
|
else
|
||||||
LD_LIBRARY_PATH=$(LIBRARY_PATH) ${RUNNER} ${BUILDPATH}/tests/paysages-tests
|
LD_LIBRARY_PATH=$(LIBRARY_PATH) ${RUNNER} ${BUILDPATH}/tests/paysages-tests $(ARGS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
run:build
|
run:build
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
CONFIG(release, debug|release): DEFINES += NDEBUG QT_NO_DEBUG_OUTPUT
|
CONFIG(release, debug|release): DEFINES += NDEBUG QT_NO_DEBUG_OUTPUT
|
||||||
|
|
||||||
QMAKE_CXXFLAGS += -std=c++11
|
QMAKE_CXXFLAGS += -std=c++14
|
||||||
|
|
|
@ -10,7 +10,9 @@ int main(int argc, char **argv) {
|
||||||
int result;
|
int result;
|
||||||
|
|
||||||
qInstallMessageHandler(noMessageOutput);
|
qInstallMessageHandler(noMessageOutput);
|
||||||
|
#ifdef NDEBUG
|
||||||
Logs::disable();
|
Logs::disable();
|
||||||
|
#endif
|
||||||
|
|
||||||
testing::InitGoogleTest(&argc, argv);
|
testing::InitGoogleTest(&argc, argv);
|
||||||
result = RUN_ALL_TESTS();
|
result = RUN_ALL_TESTS();
|
||||||
|
|
Loading…
Reference in a new issue