diff --git a/.travis.yml b/.travis.yml index 5a974fa..3f73107 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,51 +5,47 @@ matrix: - os: osx osx_image: xcode11.3 env: - - PLATFORM=SIMULATOR + - PLATFORM=SIMULATOR DEPLOYMENT_TARGET=13.1 - os: osx osx_image: xcode10.2 env: - - PLATFORM=SIMULATOR64 + - PLATFORM=SIMULATOR64 DEPLOYMENT_TARGET=12.1 - os: osx osx_image: xcode11.1 env: - - PLATFORM=OS + - PLATFORM=OS DEPLOYMENT_TARGET=13.0 - os: osx osx_image: xcode10.2 env: - - PLATFORM=OS64 + - PLATFORM=OS64 DEPLOYMENT_TARGET=12.0 - os: osx osx_image: xcode9.4 env: - - PLATFORM=OS64 - - os: osx - osx_image: xcode8.3 - env: - - PLATFORM=OS64 DEPLOYMENT_TARGET=10.0 + - PLATFORM=OS64 DEPLOYMENT_TARGET=11.0 - os: osx osx_image: xcode10.2 env: - - PLATFORM=OS BUILD_SHARED=1 + - PLATFORM=OS BUILD_SHARED=1 DEPLOYMENT_TARGET=12.0 - os: osx osx_image: xcode10.2 env: - - PLATFORM=TVOS + - PLATFORM=TVOS DEPLOYMENT_TARGET=11.0 - os: osx osx_image: xcode10.2 env: - - PLATFORM=WATCHOS + - PLATFORM=WATCHOS DEPLOYMENT_TARGET=5.0 - os: osx osx_image: xcode10.2 env: - - PLATFORM=OS64COMBINED USE_XCODE=1 + - PLATFORM=OS64COMBINED USE_XCODE=1 DEPLOYMENT_TARGET=11.0 - os: osx osx_image: xcode12.2 env: - - PLATFORM=OS64COMBINED USE_XCODE=1 + - PLATFORM=OS64COMBINED USE_XCODE=1 DEPLOYMENT_TARGET=14.0 - os: osx osx_image: xcode11.3 env: - - PLATFORM=OS64COMBINED BUILD_CURL=1 USE_XCODE=1 + - PLATFORM=OS64COMBINED BUILD_CURL=1 USE_XCODE=1 DEPLOYMENT_TARGET=11.0 install: true diff --git a/.travis/build.sh b/.travis/build.sh index 20ee2e3..7792df5 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -21,26 +21,22 @@ if [[ ${USE_XCODE} -eq 1 ]]; then GENERATOR_EXT="-G Xcode" fi -USE_STRICT_COMPILER_CHECKS_EXT="" -if [[ ${USE_STRICT_COMPILER_CHECKS} -eq 1 ]]; then - USE_STRICT_COMPILER_CHECKS_EXT="-DENABLE_STRICT_TRY_COMPILE=1" -fi - if [[ ${BUILD_CURL} -eq 1 ]]; then mkdir -p example/example-curl/build pushd example/example-curl/build cmake .. \ ${GENERATOR_EXT} -DCMAKE_TOOLCHAIN_FILE=../../ios.toolchain.cmake \ - -DPLATFORM=${PLATFORM} ${USE_STRICT_COMPILER_CHECKS_EXT} || exit 1 + -DPLATFORM=${PLATFORM} -DDEPLOYMENT_TARGET=${DEPLOYMENT_TARGET} -DENABLE_STRICT_TRY_COMPILE=${USE_STRICT_COMPILER_CHECKS} || exit 1 cmake --build . --config Release --parallel 4 || exit 1 popd else mkdir -p example/example-lib/build pushd example/example-lib/build cmake .. \ - ${GENERATOR_EXT} -DCMAKE_TOOLCHAIN_FILE=../../ios.toolchain.cmake \ - -DPLATFORM=${PLATFORM} -DDEPLOYMENT_TARGET=${DEPLOYMENT_TARGET} ${USE_STRICT_COMPILER_CHECKS_EXT} ${SHARED_EXT}\ + ${GENERATOR_EXT} -DCMAKE_TOOLCHAIN_FILE=../../ios.toolchain.cmake -DCMAKE_INSTALL_PREFIX=../out \ + -DPLATFORM=${PLATFORM} -DDEPLOYMENT_TARGET=${DEPLOYMENT_TARGET} -DENABLE_STRICT_TRY_COMPILE=${USE_STRICT_COMPILER_CHECKS} ${SHARED_EXT}\ || exit 1 - cmake --build . --config Release --target install || exit 1 + cmake --build . --config Release || exit 1 + cmake --install . --config Release || exit 1 popd fi