From 5ee91a9e101869404f24ccc0f3c74e61c459fc98 Mon Sep 17 00:00:00 2001 From: Nax Date: Thu, 3 Dec 2020 23:33:52 +0100 Subject: [PATCH] Nin 0.8.0 --- .github/workflows/nin.yml | 3 --- CMakeLists.txt | 6 ++++-- third_party/openal/CMakeLists.txt | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/nin.yml b/.github/workflows/nin.yml index 5e59fd6..9e5dd93 100644 --- a/.github/workflows/nin.yml +++ b/.github/workflows/nin.yml @@ -35,7 +35,6 @@ jobs: cmake_opts: -DCMAKE_BUILD_TYPE=Release runs-on: ${{ matrix.os }} env: - MACOSX_DEPLOYMENT_TARGET: 10.9 QT_VERSION: 5.9.9 steps: - name: Cache Qt @@ -46,8 +45,6 @@ jobs: key: Qt-${{ env.QT_VERSION }}-${{ matrix.name }} - name: Install Qt uses: jurplel/install-qt-action@v2 - env: - MACOSX_DEPLOYMENT_TARGET: '' with: arch: ${{ matrix.qt_arch }} cached: ${{ steps.cache-qt.outputs.cache-hit }} diff --git a/CMakeLists.txt b/CMakeLists.txt index 85cb123..a45cdd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,9 +26,11 @@ cmake_minimum_required(VERSION 3.14) set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") +set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9) + set(VERSION_MAJOR 0) -set(VERSION_MINOR 7) -set(VERSION_PATCH 2) +set(VERSION_MINOR 8) +set(VERSION_PATCH 0) set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") diff --git a/third_party/openal/CMakeLists.txt b/third_party/openal/CMakeLists.txt index 7d9db2b..6d5ae99 100644 --- a/third_party/openal/CMakeLists.txt +++ b/third_party/openal/CMakeLists.txt @@ -45,6 +45,7 @@ ExternalProject_Add( URL_HASH "SHA256=C32D10473457A8B545AAB50070FE84BE2B5B041E1F2099012777EE6BE0057C13" INSTALL_DIR "${CMAKE_BINARY_DIR}/third_party" CMAKE_ARGS + "-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}" "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" "-DCMAKE_INSTALL_PREFIX=" "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"