From 58dae6e9d975cbdffff57daedd1517cacffec16c Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 24 Dec 2018 20:00:51 +0200 Subject: [PATCH] Recognize GCC 8.x. --HG-- branch : develop --- Valentina.pro | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/Valentina.pro b/Valentina.pro index 8607bd36e..6fcb0e0e6 100644 --- a/Valentina.pro +++ b/Valentina.pro @@ -16,23 +16,29 @@ count(LIST, 1, >): error("The build will fail. Path '$${OUT_PWD}' contains space unix { *g++* { GCC_VERSION = $$system("g++ -dumpversion") - contains(GCC_VERSION, ^7.*$) { - message( "g++ version 7.x found" ) - CONFIG += g++7 + contains(GCC_VERSION, ^8.*$) { + message( "g++ version 8.x found" ) + CONFIG += g++8 } else { - contains(GCC_VERSION, ^6.*$) { - message( "g++ version 6.x found" ) - CONFIG += g++6 + GCC_VERSION = $$system("g++ -dumpversion") + contains(GCC_VERSION, ^7.*$) { + message( "g++ version 7.x found" ) + CONFIG += g++7 } else { - contains(GCC_VERSION, ^5.*$) { - message( "g++ version 5.x found" ) - CONFIG += g++5 + contains(GCC_VERSION, ^6.*$) { + message( "g++ version 6.x found" ) + CONFIG += g++6 } else { - contains(GCC_VERSION, ^4.*$) { - message( "g++ version 4.x found" ) - CONFIG += g++4 + contains(GCC_VERSION, ^5.*$) { + message( "g++ version 5.x found" ) + CONFIG += g++5 } else { - message( "Unknown GCC configuration" ) + contains(GCC_VERSION, ^4.*$) { + message( "g++ version 4.x found" ) + CONFIG += g++4 + } else { + message( "Unknown GCC configuration" ) + } } } }