Skip to content

Commit 4252b61

Browse files
authored
Merge pull request qgis#59221 from nicogodet/findsip-cmake
Fix FindSIP.cmake and make it more verbose
2 parents bd73140 + db4e98f commit 4252b61

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

cmake/FindSIP.cmake

+15-7
Original file line numberDiff line numberDiff line change
@@ -39,25 +39,33 @@ ELSE(SIP_VERSION)
3939
STRING(REGEX REPLACE ".*\nsip_version_num:([^\n]+).*$" "\\1" SIP_VERSION_NUM ${sip_config})
4040
STRING(REGEX REPLACE ".*\nsip_version_str:([^\n]+).*$" "\\1" SIP_VERSION_STR ${sip_config})
4141
STRING(REGEX REPLACE ".*\ndefault_sip_dir:([^\n]+).*$" "\\1" SIP_DEFAULT_SIP_DIR ${sip_config})
42+
IF(NOT SIP_FIND_QUIETLY)
43+
MESSAGE(STATUS "Found SIP version: ${SIP_VERSION_STR}")
44+
ENDIF(NOT SIP_FIND_QUIETLY)
45+
4246
IF(${SIP_VERSION_STR} VERSION_LESS 5)
4347
STRING(REGEX REPLACE ".*\nsip_bin:([^\n]+).*$" "\\1" SIP_BINARY_PATH ${sip_config})
4448
STRING(REGEX REPLACE ".*\nsip_inc_dir:([^\n]+).*$" "\\1" SIP_INCLUDE_DIR ${sip_config})
4549
STRING(REGEX REPLACE ".*\nsip_module_dir:([^\n]+).*$" "\\1" SIP_MODULE_DIR ${sip_config})
50+
SET(SIP_FOUND TRUE)
4651
ELSE(${SIP_VERSION_STR} VERSION_LESS 5)
4752
FIND_PROGRAM(SIP_BUILD_EXECUTABLE sip-build)
53+
IF(SIP_BUILD_EXECUTABLE)
54+
IF(NOT SIP_FIND_QUIETLY)
55+
MESSAGE(STATUS "Found sip-build executable: ${SIP_BUILD_EXECUTABLE}")
56+
ENDIF(NOT SIP_FIND_QUIETLY)
57+
SET(SIP_FOUND TRUE)
58+
ELSE(SIP_BUILD_EXECUTABLE)
59+
MESSAGE (FATAL_ERROR "Could not find sip-build executable")
60+
ENDIF(SIP_BUILD_EXECUTABLE)
4861
ENDIF(${SIP_VERSION_STR} VERSION_LESS 5)
49-
SET(SIP_FOUND TRUE)
5062
ENDIF(sip_config)
5163

52-
IF(SIP_FOUND)
53-
IF(NOT SIP_FIND_QUIETLY)
54-
MESSAGE(STATUS "Found SIP version: ${SIP_VERSION_STR}")
55-
ENDIF(NOT SIP_FIND_QUIETLY)
56-
ELSE(SIP_FOUND)
64+
IF(NOT SIP_FOUND)
5765
IF(SIP_FIND_REQUIRED)
5866
MESSAGE(FATAL_ERROR "Could not find SIP")
5967
ENDIF(SIP_FIND_REQUIRED)
60-
ENDIF(SIP_FOUND)
68+
ENDIF(NOT SIP_FOUND)
6169

6270
ENDIF(SIP_VERSION)
6371

0 commit comments

Comments
 (0)