Tweak build settings

remotes/origin/HEAD
redsky17 6 years ago
parent 13663ad5f8
commit fa6bc6a466
  1. 2
      .ci/macos/deploy.sh
  2. 2
      CMakeLists.txt
  3. 7
      deps/CMakeLists.txt

@ -15,7 +15,7 @@ export ICU_LIB="$(brew --prefix icu4c)/lib"
mkdir -p nheko.app/Contents/Frameworks mkdir -p nheko.app/Contents/Frameworks
find ${ICU_LIB} -type l -name "*.dylib" -exec cp -a -n {} nheko.app/Contents/Frameworks/ \; || true 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) user=$(id -nu)
sudo chown ${user} nheko.dmg sudo chown ${user} nheko.dmg

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1) cmake_minimum_required(VERSION 3.11)
option(APPVEYOR_BUILD "Build on appveyor" OFF) option(APPVEYOR_BUILD "Build on appveyor" OFF)
option(ASAN "Compile with address sanitizers" OFF) option(ASAN "Compile with address sanitizers" OFF)

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1) cmake_minimum_required(VERSION 3.11)
project(NHEKO_DEPS) project(NHEKO_DEPS)
# Point CMake at any custom modules we may ship # 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." option(USE_BUNDLED_MATRIX_CLIENT "Use the bundled version of mtxclient."
${USE_BUNDLED}) ${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) include(ExternalProject)
set(BOOST_URL set(BOOST_URL

Loading…
Cancel
Save