Skip to content

Commit 4b6d38c

Browse files
authored
Add option to suppress SIP warnings (#3230)
to fix travis builds for OSX. Yay
1 parent b63f788 commit 4b6d38c

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

ci/travis/osx/install.sh

+14-6
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,17 @@ cd build
1818
#no PGTEST for OSX - can't get postgres to start with brew install
1919
#no APIDOC for OSX - doxygen tests and warnings are covered by linux build
2020
#no deprecated-declarations warnings... requires QGIS ported to Cocoa
21-
cmake -DWITH_SERVER=ON -DWITH_STAGED_PLUGINS=ON -DWITH_GRASS=OFF \
22-
-DSUPPRESS_QT_WARNINGS=ON -DENABLE_MODELTEST=ON -DENABLE_PGTEST=OFF \
23-
-DWITH_QWTPOLAR=OFF -DWITH_PYSPATIALITE=ON \
24-
-DQWT_INCLUDE_DIR=/usr/local/opt/qwt/lib/qwt.framework/Headers/ \
25-
-DQWT_LIBRARY=/usr/local/opt/qwt/lib/qwt.framework/qwt \
26-
-DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations" ..
21+
cmake \
22+
-DWITH_SERVER=ON \
23+
-DWITH_STAGED_PLUGINS=ON \
24+
-DWITH_GRASS=OFF \
25+
-DSUPPRESS_SIP_WARNINGS=ON \
26+
-DSUPPRESS_QT_WARNINGS=ON \
27+
-DENABLE_MODELTEST=ON \
28+
-DENABLE_PGTEST=OFF \
29+
-DWITH_QWTPOLAR=OFF \
30+
-DWITH_PYSPATIALITE=ON \
31+
-DQWT_INCLUDE_DIR=/usr/local/opt/qwt/lib/qwt.framework/Headers/ \
32+
-DQWT_LIBRARY=/usr/local/opt/qwt/lib/qwt.framework/qwt \
33+
-DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations" \
34+
..

cmake/SIPMacros.cmake

+6
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,19 @@ MACRO(GENERATE_SIP_PYTHON_MODULE_CODE MODULE_NAME MODULE_SIP CPP_FILES)
9393
ENDIF(PEDANTIC)
9494

9595
SET(SIPCMD ${SIP_BINARY_PATH} ${_sip_tags} -w -e ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip})
96+
SET(SUPPRESS_SIP_WARNINGS FALSE CACHE BOOL "Hide SIP warnings")
97+
MARK_AS_ADVANCED(SUPPRESS_SIP_WARNINGS)
98+
IF(SUPPRESS_SIP_WARNINGS)
99+
SET(SIPCMD ${SIPCMD} 2> /dev/null || true)
100+
ENDIF(SUPPRESS_SIP_WARNINGS)
96101

97102
ADD_CUSTOM_COMMAND(
98103
OUTPUT ${_sip_output_files}
99104
COMMAND ${CMAKE_COMMAND} -E echo ${message}
100105
COMMAND ${CMAKE_COMMAND} -E touch ${_sip_output_files}
101106
COMMAND ${SIPCMD}
102107
DEPENDS ${_abs_module_sip} ${SIP_EXTRA_FILES_DEPEND}
108+
VERBATIM
103109
)
104110

105111
ADD_CUSTOM_TARGET(generate_sip_${MODULE_NAME}_cpp_files DEPENDS ${_sip_output_files})

0 commit comments

Comments
 (0)