Add g++-8 specific version support.
This commit is contained in:
@@ -15,6 +15,7 @@ greaterThan(CLANG_VERSION, 4) {
|
|||||||
message('clang' version is above 4. Using regular clang.)
|
message('clang' version is above 4. Using regular clang.)
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
message('clang' version is not above 4. Attempting to use highest specific version.)
|
||||||
system("clang-5 --version") {
|
system("clang-5 --version") {
|
||||||
QMAKE_CXX = clang-5
|
QMAKE_CXX = clang-5
|
||||||
message('clang-5' found.)
|
message('clang-5' found.)
|
||||||
|
|||||||
@@ -1,14 +1,17 @@
|
|||||||
# 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.
|
|
||||||
GCC_VERSION = $$system("g++ -dumpversion")
|
GCC_VERSION = $$system("g++ -dumpversion")
|
||||||
!greaterThan(GCC_VERSION, 6) {
|
greaterThan(GCC_VERSION, 6) {
|
||||||
message('g++' version is not above 7. Manually using 'g++-7'.)
|
message('g++' version is above 6. Using regular g++.)
|
||||||
!system(g++-7 --version) {
|
}
|
||||||
error(At least g++-7 required.)
|
else {
|
||||||
|
message('g++' version is not above 6. Attempting to use highest specific version.)
|
||||||
|
system(g++-7 --version) {
|
||||||
|
message('g++-7' found.)
|
||||||
|
QMAKE_CXX = g++-7
|
||||||
|
}
|
||||||
|
system(g++-8 --version) {
|
||||||
|
message('g++-8' found.)
|
||||||
|
QMAKE_CXX = g++-8
|
||||||
}
|
}
|
||||||
#g++-7 is needed for C++17 features. travis does not supply this by default.
|
|
||||||
QMAKE_CXX = g++-7
|
|
||||||
}
|
}
|
||||||
|
|
||||||
include(clang-gcc-common-switches.pri)
|
include(clang-gcc-common-switches.pri)
|
||||||
|
|||||||
Reference in New Issue
Block a user