Skip to content
Permalink
Browse files

[travis] Fix OSX build

  • Loading branch information
nyalldawson committed Jul 26, 2016
1 parent ce34382 commit 5b8a9f057c75584db4b35a8f61266b565c620310
Showing with 6 additions and 2 deletions.
  1. +0 −2 .travis.yml
  2. +6 −0 cmake/SIPMacros.cmake
@@ -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
@@ -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)

0 comments on commit 5b8a9f0

Please sign in to comment.
You can’t perform that action at this time.