chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-07 11:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated compiler branches to work with big sur +

Browse Source 
big sur + now reads compiler branches correctly
added -Wno-error for deprecated-copy for qt 5.12
This commit is contained in:
Jeff Norman 2022-04-27 13:49:40 -04:00
parent f63bb39d54
commit a9e135fa88
1 changed files with 9 additions and 7 deletions

16
oscar/oscar.pro
View File

@ -527,7 +527,6 @@ message("CXXFLAGS pre-mods $$QMAKE_CXXFLAGS ")
QMAKE_CFLAGS += -Werror QMAKE_CFLAGS += -Werror
QMAKE_CXXFLAGS += -Werror QMAKE_CXXFLAGS += -Werror
gcc | clang { gcc | clang {
COMPILER_VERSION = $$system($$QMAKE_CXX " -dumpversion") COMPILER_VERSION = $$system($$QMAKE_CXX " -dumpversion")
COMPILER_MAJOR = $$split(COMPILER_VERSION, ".") COMPILER_MAJOR = $$split(COMPILER_VERSION, ".")
@ -536,25 +535,28 @@ gcc | clang {
message("$$QMAKE_CXX major version $$COMPILER_MAJOR") message("$$QMAKE_CXX major version $$COMPILER_MAJOR")
} }
## equals($$QMAKE_CXX, "gcc") : { // guess what! the name is really "g++" gcc:!clang {
equals(QMAKE_CXX, g++) { message("Building for $$QMAKE_HOST.os")
message("Detected compiler g++")
greaterThan(COMPILER_MAJOR, 10) : { greaterThan(COMPILER_MAJOR, 10) : {
QMAKE_CFLAGS += -Wno-error=stringop-overread QMAKE_CFLAGS += -Wno-error=stringop-overread
QMAKE_CXXFLAGS += -Wno-error=stringop-overread QMAKE_CXXFLAGS += -Wno-error=stringop-overread
message("Making stringop-overread a non-error") message("Making stringop-overread a non-error")
} }
} }
equals(QMAKE_CXX, clang++) {
message("Detected compiler clang++")
}
clang {
message("Building for $$QMAKE_HOST.os")
QMAKE_CFLAGS_WARN_ON += -Wno-error=deprecated-copy
QMAKE_CXXFLAGS_WARN_ON += -Wno-error=deprecated-copy
message("Making deprecated-copy a non-error")
}
# Make deprecation warnings just warnings # Make deprecation warnings just warnings
QMAKE_CFLAGS += -Wno-error=deprecated-declarations QMAKE_CFLAGS += -Wno-error=deprecated-declarations
QMAKE_CXXFLAGS += -Wno-error=deprecated-declarations QMAKE_CXXFLAGS += -Wno-error=deprecated-declarations
message("CXXFLAGS post-mods $$QMAKE_CXXFLAGS ") message("CXXFLAGS post-mods $$QMAKE_CXXFLAGS ")
message("CXXFLAGS_WARN_ON $$QMAKE_CXXFLAGS_WARN_ON")
lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,9) { lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,9) {
QMAKE_CFLAGS += -Wno-error=strict-aliasing QMAKE_CFLAGS += -Wno-error=strict-aliasing