From b60113fb8e4c189d974116d272c8d98e2ae3dfd8 Mon Sep 17 00:00:00 2001 From: Vasily Date: Sat, 20 Apr 2019 18:06:00 +0200 Subject: [PATCH] Replace GCC version regex with simpler solution --- build_scripts/qt/compilers/gcc.pri | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_scripts/qt/compilers/gcc.pri b/build_scripts/qt/compilers/gcc.pri index e98d549..1e6a70a 100644 --- a/build_scripts/qt/compilers/gcc.pri +++ b/build_scripts/qt/compilers/gcc.pri @@ -1,8 +1,8 @@ - # Makes sure the "g++" command used to invoke the compilation is abvove version 7. # If it's at or above version 7 then we can use the default g++, otherwise we'll # specifically need g++-7. -system( g++ --version | grep -e " [0-9]\?[0-9]\?[6-9].[0-9]" ) { +GCC_VERSION = $$system("g++ -dumpversion") +!greaterThan(GCC_VERSION, 6) { message('g++' version is not above 7. Manually using 'g++-7'.) !system(g++-7 --version) { error(At least g++-7 required.)