diff options
| author | Dominik Holland <dominik.holland@qt.io> | 2021-07-06 13:38:13 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@qt.io> | 2021-07-07 14:15:07 +0200 |
| commit | d4f455b222fc05abd9a91429bbe6da7dbe00b09d (patch) | |
| tree | 7d321012acd0ae994abdc4f3ef06f12d25332f8f /cmake/QtInterfaceFrameworkSetup.cmake | |
| parent | 1695239cef202fa75dbe9bb86e690b7f5e10874e (diff) | |
Update the bundled qface to the latest version (2.0.4)
Also change the configure check to allow newer releases
of qface, instead of expecting the exact version.
Change-Id: I7376ee4b8d8ec08e6a3023c86bbf366f7f8269c9
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Diffstat (limited to 'cmake/QtInterfaceFrameworkSetup.cmake')
| -rw-r--r-- | cmake/QtInterfaceFrameworkSetup.cmake | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/cmake/QtInterfaceFrameworkSetup.cmake b/cmake/QtInterfaceFrameworkSetup.cmake index e536ff48..d9555e86 100644 --- a/cmake/QtInterfaceFrameworkSetup.cmake +++ b/cmake/QtInterfaceFrameworkSetup.cmake @@ -3,9 +3,13 @@ function(qt_config_python3_package_test name) return() endif() - cmake_parse_arguments(arg "" "LABEL;PACKAGE;VERSION" + cmake_parse_arguments(arg "" "LABEL;PACKAGE;CONDITION;VERSION" "" ${ARGN}) + if(NOT arg_CONDITION) + set(arg_CONDITION VERSION_EQUAL) + endif() + message(STATUS "Performing Test ${arg_LABEL}") execute_process(COMMAND ${Python3_EXECUTABLE} "-c" "import pkg_resources; print(pkg_resources.get_distribution(\"${arg_PACKAGE}\").version)" @@ -19,10 +23,11 @@ function(qt_config_python3_package_test name) if(${${name}_RESULT} EQUAL 0) if(DEFINED arg_VERSION) - message(STATUS "Checking for exact version:") + message(STATUS "Checking for version:") message(STATUS "Expected: ${arg_VERSION}") + message(STATUS "Condition: ${arg_CONDITION}") message(STATUS "Got: ${${name}_VERSION}") - if("${arg_VERSION}" VERSION_EQUAL "${${name}_VERSION}") + if("${${name}_VERSION}" ${arg_CONDITION} "${arg_VERSION}") set(HAVE_${name} TRUE) set(status_label "Success") endif() |