Browse Source

Fix cmake usage under macOS

pull/28/head
falkTX 2 years ago
parent
commit
2e417cab2d
2 changed files with 5 additions and 4 deletions
  1. +4
    -4
      local.env
  2. +1
    -0
      setup/functions.sh

+ 4
- 4
local.env View File

@@ -101,13 +101,13 @@ else
fi

if [ "${MACOS_UNIVERSAL_10_15}" -eq 1 ]; then
CMAKE="${CMAKE} -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15"
CMAKE="${CMAKE} -DCMAKE_OSX_ARCHITECTURES='arm64;x86_64' -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_SYSROOT=macosx"
elif [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
CMAKE="${CMAKE} -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12"
CMAKE="${CMAKE} -DCMAKE_OSX_ARCHITECTURES='arm64;x86_64' -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DCMAKE_OSX_SYSROOT=macosx"
elif [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
CMAKE="${CMAKE} -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12"
CMAKE="${CMAKE} -DCMAKE_OSX_ARCHITECTURES='arm64;x86_64' -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DCMAKE_OSX_SYSROOT=macosx"
elif [ "${MACOS}" -eq 1 ]; then
CMAKE="${CMAKE} -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.8"
CMAKE="${CMAKE} -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.8 -DCMAKE_OSX_SYSROOT=macosx"
elif [ "${WIN32}" -eq 1 ]; then
CMAKE="${CMAKE} -DCMAKE_RC_COMPILER=${WINDRES}"
fi


+ 1
- 0
setup/functions.sh View File

@@ -348,6 +348,7 @@ function build_cmake() {
fi
extraconfrules+=" -DCMAKE_OSX_ARCHITECTURES=${OSX_ARCHS}"
extraconfrules+=" -DCMAKE_OSX_DEPLOYMENT_TARGET=${OSX_TARGET}"
extraconfrules+=" -DCMAKE_OSX_SYSROOT=macosx"
elif [ "${WIN32}" -eq 1 ]; then
extraconfrules+=" -DCMAKE_RC_COMPILER=${WINDRES}"
fi


Loading…
Cancel
Save