From bf0ec550dacb8dab63cbe21b493c87e24c3ec9b0 Mon Sep 17 00:00:00 2001
From: Nikolay Kasyanov <nikolay.kasyanov@flixbus.com>
Date: Thu, 7 Jul 2016 01:09:59 +0200
Subject: [PATCH] OS X: specify minimum CMake version & remove redundant
 argument from CI script

---
 CI/before_script.osx.sh | 1 -
 CMakeLists.txt          | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh
index bf38186f62..164208f49b 100755
--- a/CI/before_script.osx.sh
+++ b/CI/before_script.osx.sh
@@ -10,7 +10,6 @@ mkdir build
 cd build
 
 cmake \
--D PKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON \
 -D CMAKE_EXE_LINKER_FLAGS="-lz" \
 -D CMAKE_PREFIX_PATH="$DEPENDENCIES_ROOT;$QT_PATH" \
 -D CMAKE_OSX_DEPLOYMENT_TARGET="10.8" \
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 14a1c15c80..133d9f7e62 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,7 +140,10 @@ if (USE_QT)
     endif()
 endif()
 
-if (USE_QT AND DESIRED_QT_VERSION MATCHES 5)
+if (APPLE)
+    # OS X build process relies on this fix: https://github.com/Kitware/CMake/commit/3df5147043d83aa09acd5c9ce31d5c602efb99db
+    cmake_minimum_required(VERSION 3.1.0)
+elseif (USE_QT AND DESIRED_QT_VERSION MATCHES 5)
     # 2.8.11+ is required to make Qt5 happy and allow linking QtMain on Windows.
     cmake_minimum_required(VERSION 2.8.11)
 else()