Skip to content

Commit

Permalink
Merge 2cdbc80 into 6b6c77c
Browse files Browse the repository at this point in the history
  • Loading branch information
vadi2 committed Aug 6, 2019
2 parents 6b6c77c + 2cdbc80 commit 930d46d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 18 deletions.
19 changes: 3 additions & 16 deletions src/CMakeLists.txt
Expand Up @@ -334,25 +334,12 @@ if((APPLE) AND (PKG_CONFIG_FOUND))
endif()
endif()

find_package(Qt5 5.7 REQUIRED COMPONENTS Core Multimedia Network OpenGL UiTools Widgets Concurrent)

# This is not present before Qt 5.7:
find_package(Qt5 5.11 REQUIRED COMPONENTS Core Multimedia Network OpenGL UiTools Widgets Concurrent)
find_package(Qt5 COMPONENTS Gamepad QUIET)

# This is not present before Qt 5.9:
find_package(Qt5 COMPONENTS TextToSpeech QUIET)

if (Qt5Core_VERSION VERSION_LESS 5.7)
message(FATAL_ERROR "Mudlet requires Qt 5.7 or later, yours is ${Qt5Core_VERSION}")
elif(Qt5Core_VERSION VERSION_LESS 5.9)
# Qt Gamepad was a Technology Preview in 5.7
# Qt Gamepad was a Technology Preview 2 in 5.8
# Qt Speech (or at least the TTS part) was a Technology Preview in 5.8
message(WARNING "Qt version: ${Qt5Core_VERSION} - Gamepad and TextToSpeech may not be supported, as officially they requires 5.9 and 5.10 respectively")
elif(Qt5Core_VERSION VERSION_LESS 5.10)
# Qt Speech (or at least the TTS part) was a Technology Preview 2 in 5.9, now supported on Mingw
# Qt Gamepad was officially released in 5.9
message(WARNING "Qt version: ${Qt5Core_VERSION} - TextToSpeech may not be supported, officially it requires 5.10")
if (Qt5Core_VERSION VERSION_LESS 5.11)
message(FATAL_ERROR "Mudlet requires Qt 5.11 or later, yours is ${Qt5Core_VERSION}")
else()
# Qt Speech (or at least the TTS part) was officially release in 5.10
message(STATUS "Qt version: ${Qt5Core_VERSION}")
Expand Down
4 changes: 2 additions & 2 deletions src/mudlet.pro
Expand Up @@ -34,8 +34,8 @@
# #
############################################################################

lessThan(QT_MAJOR_VERSION, 5)|if(lessThan(QT_MAJOR_VERSION,6):lessThan(QT_MINOR_VERSION, 7)) {
error("Mudlet requires Qt 5.7 or later")
lessThan(QT_MAJOR_VERSION, 5)|if(lessThan(QT_MAJOR_VERSION,6):lessThan(QT_MINOR_VERSION, 11)) {
error("Mudlet requires Qt 5.11 or later")
}

# Including IRC Library
Expand Down

0 comments on commit 930d46d

Please sign in to comment.