File tree 2 files changed +3
-3
lines changed
2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change 13
13
#
14
14
# SIP_VERSION_STR - The version of SIP found as a human readable string.
15
15
#
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.
17
17
#
18
18
# SIP_INCLUDE_DIR - Directory holding the SIP C++ header file.
19
19
#
@@ -37,7 +37,7 @@ ELSE(SIP_VERSION)
37
37
IF (sip_config)
38
38
STRING (REGEX REPLACE "^sip_version:([^\n ]+).*$" "\\ 1" SIP_VERSION ${sip_config} )
39
39
STRING (REGEX REPLACE ".*\n sip_version_str:([^\n ]+).*$" "\\ 1" SIP_VERSION_STR ${sip_config} )
40
- STRING (REGEX REPLACE ".*\n sip_bin:([^\n ]+).*$" "\\ 1" SIP_EXECUTABLE ${sip_config} )
40
+ STRING (REGEX REPLACE ".*\n sip_bin:([^\n ]+).*$" "\\ 1" SIP_BINARY_PATH ${sip_config} )
41
41
STRING (REGEX REPLACE ".*\n default_sip_dir:([^\n ]+).*$" "\\ 1" SIP_DEFAULT_SIP_DIR ${sip_config} )
42
42
STRING (REGEX REPLACE ".*\n sip_inc_dir:([^\n ]+).*$" "\\ 1" SIP_INCLUDE_DIR ${sip_config} )
43
43
SET (SIP_FOUND TRUE )
Original file line number Diff line number Diff line change @@ -99,7 +99,7 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP)
99
99
OUTPUT ${_sip_output_files}
100
100
COMMAND ${CMAKE_COMMAND} -E echo ${message}
101
101
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}
103
103
DEPENDS ${_abs_module_sip} ${SIP_EXTRA_FILES_DEPEND}
104
104
)
105
105
# not sure if type MODULE could be uses anywhere, limit to cygwin for now
You can’t perform that action at this time.
0 commit comments