[travis] Fix OSX build

qgis · Jul 26, 2016 · 5b8a9f0 · 5b8a9f0
1 parent ce34382
commit 5b8a9f0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,5 @@
 matrix:
   fast_finish: true
-  allow_failures:
-    - os: osx
   include:
     # QT4 based build with Python 2.7 // using container based builds and prebuild binary dependencies in osgeo4travis
     - os: linux

diff --git a/cmake/SIPMacros.cmake b/cmake/SIPMacros.cmake
@@ -103,13 +103,19 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP)
 
 
     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})
+    SET(SUPPRESS_SIP_WARNINGS FALSE CACHE BOOL "Hide SIP warnings")
+    MARK_AS_ADVANCED(SUPPRESS_SIP_WARNINGS)
+    IF(SUPPRESS_SIP_WARNINGS)
+      SET(SIPCMD ${SIPCMD} 2> /dev/null || true)
+    ENDIF(SUPPRESS_SIP_WARNINGS)
 
     ADD_CUSTOM_COMMAND(
         OUTPUT ${_sip_output_files}
         COMMAND ${CMAKE_COMMAND} -E echo ${message}
         COMMAND ${CMAKE_COMMAND} -E touch ${_sip_output_files}
         COMMAND ${SIPCMD}
         DEPENDS ${_abs_module_sip} ${SIP_EXTRA_FILES_DEPEND}
+        VERBATIM
     )
     # not sure if type MODULE could be uses anywhere, limit to cygwin for now
     IF (CYGWIN OR APPLE)