From db4e98f2d1ec8551ba66e15e447bb82e9d98bb91 Mon Sep 17 00:00:00 2001 From: Nicolas Godet <39594821+nicogodet@users.noreply.github.com> Date: Fri, 25 Oct 2024 18:24:22 +0200 Subject: [PATCH] Fix FindSIP.cmake and make it more verbose --- cmake/FindSIP.cmake | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/cmake/FindSIP.cmake b/cmake/FindSIP.cmake index 101a991d7de1..b3374c7c9beb 100644 --- a/cmake/FindSIP.cmake +++ b/cmake/FindSIP.cmake @@ -39,25 +39,33 @@ ELSE(SIP_VERSION) STRING(REGEX REPLACE ".*\nsip_version_num:([^\n]+).*$" "\\1" SIP_VERSION_NUM ${sip_config}) STRING(REGEX REPLACE ".*\nsip_version_str:([^\n]+).*$" "\\1" SIP_VERSION_STR ${sip_config}) STRING(REGEX REPLACE ".*\ndefault_sip_dir:([^\n]+).*$" "\\1" SIP_DEFAULT_SIP_DIR ${sip_config}) + IF(NOT SIP_FIND_QUIETLY) + MESSAGE(STATUS "Found SIP version: ${SIP_VERSION_STR}") + ENDIF(NOT SIP_FIND_QUIETLY) + IF(${SIP_VERSION_STR} VERSION_LESS 5) STRING(REGEX REPLACE ".*\nsip_bin:([^\n]+).*$" "\\1" SIP_BINARY_PATH ${sip_config}) STRING(REGEX REPLACE ".*\nsip_inc_dir:([^\n]+).*$" "\\1" SIP_INCLUDE_DIR ${sip_config}) STRING(REGEX REPLACE ".*\nsip_module_dir:([^\n]+).*$" "\\1" SIP_MODULE_DIR ${sip_config}) + SET(SIP_FOUND TRUE) ELSE(${SIP_VERSION_STR} VERSION_LESS 5) FIND_PROGRAM(SIP_BUILD_EXECUTABLE sip-build) + IF(SIP_BUILD_EXECUTABLE) + IF(NOT SIP_FIND_QUIETLY) + MESSAGE(STATUS "Found sip-build executable: ${SIP_BUILD_EXECUTABLE}") + ENDIF(NOT SIP_FIND_QUIETLY) + SET(SIP_FOUND TRUE) + ELSE(SIP_BUILD_EXECUTABLE) + MESSAGE (FATAL_ERROR "Could not find sip-build executable") + ENDIF(SIP_BUILD_EXECUTABLE) ENDIF(${SIP_VERSION_STR} VERSION_LESS 5) - SET(SIP_FOUND TRUE) ENDIF(sip_config) - IF(SIP_FOUND) - IF(NOT SIP_FIND_QUIETLY) - MESSAGE(STATUS "Found SIP version: ${SIP_VERSION_STR}") - ENDIF(NOT SIP_FIND_QUIETLY) - ELSE(SIP_FOUND) + IF(NOT SIP_FOUND) IF(SIP_FIND_REQUIRED) MESSAGE(FATAL_ERROR "Could not find SIP") ENDIF(SIP_FIND_REQUIRED) - ENDIF(SIP_FOUND) + ENDIF(NOT SIP_FOUND) ENDIF(SIP_VERSION)