From d0b36a87ccb56439baad94de1fbc45d3a86aab88 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Mon, 1 Jul 2024 11:36:31 +0200 Subject: [PATCH] More robust sip version check --- cmake/FindPyQt6.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/FindPyQt6.cmake b/cmake/FindPyQt6.cmake index a938417a03fd..1e54cbecfe9d 100644 --- a/cmake/FindPyQt6.cmake +++ b/cmake/FindPyQt6.cmake @@ -22,7 +22,7 @@ IF(EXISTS PYQT6_VERSION_STR) SET(PYQT6_FOUND TRUE) ELSE(EXISTS PYQT6_VERSION_STR) - IF(SIP_BUILD_EXECUTABLE) + IF(${SIP_VERSION_STR} VERSION_GREATER 4) # SIP >= 5.0 path FILE(GLOB _pyqt6_metadata "${Python_SITEARCH}/PyQt6-*.dist-info/METADATA") @@ -42,7 +42,7 @@ ELSE(EXISTS PYQT6_VERSION_STR) SET(PYQT6_FOUND TRUE) ENDIF(PYQT6_VERSION_STR) - ELSE(SIP_BUILD_EXECUTABLE) + ELSE() # SIP 4.x path FIND_FILE(_find_pyqt6_py FindPyQt6.py PATHS ${CMAKE_MODULE_PATH} NO_CMAKE_FIND_ROOT_PATH) @@ -61,7 +61,7 @@ ELSE(EXISTS PYQT6_VERSION_STR) SET(PYQT6_FOUND TRUE) ENDIF(pyqt_config) - ENDIF(SIP_BUILD_EXECUTABLE) + ENDIF() IF(PYQT6_FOUND) IF(NOT PyQt6_FIND_QUIETLY)