mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-01 02:53:56 -07:00
small refactor
This commit is contained in:
parent
062c8adebb
commit
6bdc14f9ec
1 changed files with 6 additions and 5 deletions
|
|
@ -130,14 +130,15 @@ fi
|
||||||
mkdir -p ../cmake/triplets
|
mkdir -p ../cmake/triplets
|
||||||
# Replace dots with hyphens in triplet name for vcpkg compatibility
|
# Replace dots with hyphens in triplet name for vcpkg compatibility
|
||||||
TRIPLET_VERSION=$(echo "${TARGET_MACOS_VERSION}" | sed 's/\./-/g')
|
TRIPLET_VERSION=$(echo "${TARGET_MACOS_VERSION}" | sed 's/\./-/g')
|
||||||
cp ../vcpkg/triplets/x64-osx.cmake ../cmake/triplets/x64-osx-${TRIPLET_VERSION}.cmake
|
TRIPLET_FILE="../cmake/triplets/x64-osx-${TRIPLET_VERSION}.cmake"
|
||||||
echo "set(VCPKG_CMAKE_SYSTEM_VERSION ${TARGET_MACOS_VERSION})" >> ../cmake/triplets/x64-osx-${TRIPLET_VERSION}.cmake
|
cp ../vcpkg/triplets/x64-osx.cmake "$TRIPLET_FILE"
|
||||||
echo "set(VCPKG_OSX_DEPLOYMENT_TARGET ${TARGET_MACOS_VERSION})" >> ../cmake/triplets/x64-osx-${TRIPLET_VERSION}.cmake
|
echo "set(VCPKG_CMAKE_SYSTEM_VERSION ${TARGET_MACOS_VERSION})" >> "$TRIPLET_FILE"
|
||||||
|
echo "set(VCPKG_OSX_DEPLOYMENT_TARGET ${TARGET_MACOS_VERSION})" >> "$TRIPLET_FILE"
|
||||||
flags+=("-DVCPKG_OVERLAY_TRIPLETS=../cmake/triplets")
|
flags+=("-DVCPKG_OVERLAY_TRIPLETS=../cmake/triplets")
|
||||||
flags+=("-DVCPKG_TARGET_TRIPLET=x64-osx-${TRIPLET_VERSION}")
|
flags+=("-DVCPKG_TARGET_TRIPLET=x64-osx-${TRIPLET_VERSION}")
|
||||||
flags+=("-DCMAKE_OSX_DEPLOYMENT_TARGET=${TARGET_MACOS_VERSION}")
|
flags+=("-DCMAKE_OSX_DEPLOYMENT_TARGET=${TARGET_MACOS_VERSION}")
|
||||||
echo "::group::Show generated triplet"
|
echo "::group::Generated triplet $TRIPLET_FILE"
|
||||||
cat ../cmake/triplets/x64-osx-${TRIPLET_VERSION}.cmake
|
cat "$TRIPLET_FILE"
|
||||||
echo "::endgroup::"
|
echo "::endgroup::"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue