Tweak build settings

Nheko-Reborn · Feb 8, 2019 · fa6bc6a · fa6bc6a · redsky17 · Feb 8, 2019
1 parent 13663ad
commit fa6bc6a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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