Skip to content

Commit 0115150

Browse files
author
wonder
committed
Changed SIP_EXECUTABLE to SIP_BINARY_PATH to keep original variable name.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12775 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent b5be69f commit 0115150

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

cmake/FindSIP.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#
1414
# SIP_VERSION_STR - The version of SIP found as a human readable string.
1515
#
16-
# SIP_EXECUTABLE - Path and filename of the SIP command line executable.
16+
# SIP_BINARY_PATH - Path and filename of the SIP command line executable.
1717
#
1818
# SIP_INCLUDE_DIR - Directory holding the SIP C++ header file.
1919
#
@@ -37,7 +37,7 @@ ELSE(SIP_VERSION)
3737
IF(sip_config)
3838
STRING(REGEX REPLACE "^sip_version:([^\n]+).*$" "\\1" SIP_VERSION ${sip_config})
3939
STRING(REGEX REPLACE ".*\nsip_version_str:([^\n]+).*$" "\\1" SIP_VERSION_STR ${sip_config})
40-
STRING(REGEX REPLACE ".*\nsip_bin:([^\n]+).*$" "\\1" SIP_EXECUTABLE ${sip_config})
40+
STRING(REGEX REPLACE ".*\nsip_bin:([^\n]+).*$" "\\1" SIP_BINARY_PATH ${sip_config})
4141
STRING(REGEX REPLACE ".*\ndefault_sip_dir:([^\n]+).*$" "\\1" SIP_DEFAULT_SIP_DIR ${sip_config})
4242
STRING(REGEX REPLACE ".*\nsip_inc_dir:([^\n]+).*$" "\\1" SIP_INCLUDE_DIR ${sip_config})
4343
SET(SIP_FOUND TRUE)

cmake/SIPMacros.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP)
9999
OUTPUT ${_sip_output_files}
100100
COMMAND ${CMAKE_COMMAND} -E echo ${message}
101101
COMMAND ${TOUCH_COMMAND} ${_sip_output_files}
102-
COMMAND ${SIP_EXECUTABLE} ${_sip_tags} ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip}
102+
COMMAND ${SIP_BINARY_PATH} ${_sip_tags} ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip}
103103
DEPENDS ${_abs_module_sip} ${SIP_EXTRA_FILES_DEPEND}
104104
)
105105
# not sure if type MODULE could be uses anywhere, limit to cygwin for now

0 commit comments

Comments
 (0)