diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 27fa752e..132e4a94 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,7 +57,7 @@ endif() # Updated by tools/make-version.py set(PROJECT_MAJOR_VERSION 4) set(PROJECT_MINOR_VERSION 2) -set(PROJECT_PATCH_VERSION 2) +set(PROJECT_PATCH_VERSION 4) set(PROJECT_BUILD_VERSION 0) set(PROJECT_VERSION_EXTENSION "") @@ -1499,15 +1499,15 @@ if (QT_FOUND) # https://doc.qt.io/qt-5.11/supported-platforms-and-configurations.html # https://doc.qt.io/qt-5.15/supported-platforms.html # https://doc-snapshots.qt.io/qt6-dev/supported-platforms.html - if(Qt${qtver}Widgets_VERSION VERSION_GREATER_EQUAL "6.5.0") + if(Qt${qtver}Widgets_VERSION VERSION_GREATER_EQUAL "6.5.0" AND MIN_MACOS_VERSION VERSION_LESS "11.0") set(MIN_MACOS_VERSION 11.0) - elseif(Qt${qtver}Widgets_VERSION VERSION_GREATER_EQUAL "6.0.0") + elseif(Qt${qtver}Widgets_VERSION VERSION_GREATER_EQUAL "6.0.0" AND MIN_MACOS_VERSION VERSION_LESS "10.14") set(MIN_MACOS_VERSION 10.14) - elseif(Qt5Widgets_VERSION VERSION_GREATER_EQUAL "5.14.0") + elseif(Qt5Widgets_VERSION VERSION_GREATER_EQUAL "5.14.0" AND MIN_MACOS_VERSION VERSION_LESS "10.13") set(MIN_MACOS_VERSION 10.13) - elseif(Qt5Widgets_VERSION VERSION_GREATER_EQUAL "5.12.0") + elseif(Qt5Widgets_VERSION VERSION_GREATER_EQUAL "5.12.0" AND MIN_MACOS_VERSION VERSION_LESS "10.12") set(MIN_MACOS_VERSION 10.12) - elseif(Qt5Widgets_VERSION VERSION_GREATER_EQUAL "5.10.0") + elseif(Qt5Widgets_VERSION VERSION_GREATER_EQUAL "5.10.0" AND MIN_MACOS_VERSION VERSION_LESS "10.11") set(MIN_MACOS_VERSION 10.11) endif() if(CMAKE_OSX_DEPLOYMENT_TARGET AND CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS MIN_MACOS_VERSION) |