From 0594b825f779164ab9023cca6810ad73c9ebe9ff Mon Sep 17 00:00:00 2001
From: Alexander Widerberg <alexander.widerberg@xmreality.se>
Date: Tue, 2 Mar 2021 15:18:49 +0100
Subject: [PATCH 1/2] Hopefully fixes travis build since too old versions of
 CMake was installed on older images on travis.

---
 .travis.yml      | 26 +++++++++++---------------
 .travis/build.sh | 12 ++++--------
 2 files changed, 15 insertions(+), 23 deletions(-)

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..3dd13d5 100755
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -21,17 +21,12 @@ 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
@@ -39,8 +34,9 @@ else
   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}\
+    -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

From faf37192fcda85c5c937896fdc593442d67a10f6 Mon Sep 17 00:00:00 2001
From: Alexander Widerberg <alexander.widerberg@xmreality.se>
Date: Tue, 2 Mar 2021 15:53:43 +0100
Subject: [PATCH 2/2] Last try to get the combined options to build on travis
 (builds locally using CMake 3.19.4)

---
 .travis/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis/build.sh b/.travis/build.sh
index 3dd13d5..7792df5 100755
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -33,7 +33,7 @@ else
   mkdir -p example/example-lib/build
   pushd example/example-lib/build
   cmake .. \
-    ${GENERATOR_EXT} -DCMAKE_TOOLCHAIN_FILE=../../ios.toolchain.cmake \
+    ${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 || exit 1