From fa6bc6a466afe509e1098b04f0bcf4a18b3abbf5 Mon Sep 17 00:00:00 2001
From: redsky17 <joedonofry@gmail.com>
Date: Fri, 8 Feb 2019 03:20:03 +0000
Subject: [PATCH] Tweak build settings

---
 .ci/macos/deploy.sh | 2 +-
 CMakeLists.txt      | 2 +-
 deps/CMakeLists.txt | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.ci/macos/deploy.sh b/.ci/macos/deploy.sh
index 03d377bc..79701243 100755
--- a/.ci/macos/deploy.sh
+++ b/.ci/macos/deploy.sh
@@ -15,7 +15,7 @@ export ICU_LIB="$(brew --prefix icu4c)/lib"
 mkdir -p nheko.app/Contents/Frameworks
 find ${ICU_LIB} -type l -name "*.dylib" -exec cp -a -n {} nheko.app/Contents/Frameworks/ \; || true
 
-sudo macdeployqt nheko.app -dmg
+sudo macdeployqt nheko.app -dmg -always-overwrite
 
 user=$(id -nu)
 sudo chown ${user} nheko.dmg
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae6edb87..65f26890 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.11)
 
 option(APPVEYOR_BUILD "Build on appveyor" OFF)
 option(ASAN "Compile with address sanitizers" OFF)
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
index e7a09db6..5aab771c 100644
--- a/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.11)
 project(NHEKO_DEPS)
 
 # Point CMake at any custom modules we may ship
@@ -30,6 +30,11 @@ option(USE_BUNDLED_LMDBXX "Use the bundled version of lmdbxx." ${USE_BUNDLED})
 option(USE_BUNDLED_MATRIX_CLIENT "Use the bundled version of mtxclient."
        ${USE_BUNDLED})
 
+if(USE_BUNDLED_BOOST)
+  # bundled boost is 1.68, which requires CMake 3.13 or greater.
+  cmake_minimum_required(VERSION 3.13)
+endif()
+
 include(ExternalProject)
 
 set(BOOST_URL