From 802e735225bc4436de0ae12084cc2e96df306282 Mon Sep 17 00:00:00 2001 From: Bruno Alexandre Rosa <1791393+brunoalr@users.noreply.github.com> Date: Fri, 3 Oct 2025 21:36:53 -0300 Subject: [PATCH] another minor refactor --- .ci/compile.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.ci/compile.sh b/.ci/compile.sh index 398eb7b81..b644fa55f 100755 --- a/.ci/compile.sh +++ b/.ci/compile.sh @@ -127,14 +127,15 @@ if [[ $PACKAGE_TYPE ]]; then flags+=("-DCPACK_GENERATOR=$PACKAGE_TYPE") fi if [[ $TARGET_MACOS_VERSION ]]; then - mkdir -p ../cmake/triplets + TRIPLETS_DIR="../cmake/triplets" + mkdir -p "$TRIPLETS_DIR" # Replace dots with hyphens in triplet name for vcpkg compatibility TRIPLET_VERSION=$(echo "${TARGET_MACOS_VERSION}" | sed 's/\./-/g') - TRIPLET_FILE="../cmake/triplets/x64-osx-${TRIPLET_VERSION}.cmake" + TRIPLET_FILE="$TRIPLETS_DIR/x64-osx-${TRIPLET_VERSION}.cmake" cp ../vcpkg/triplets/x64-osx.cmake "$TRIPLET_FILE" 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=$TRIPLETS_DIR") flags+=("-DVCPKG_TARGET_TRIPLET=x64-osx-${TRIPLET_VERSION}") flags+=("-DCMAKE_OSX_DEPLOYMENT_TARGET=${TARGET_MACOS_VERSION}") echo "::group::Generated triplet $TRIPLET_FILE"