From c6b477366e24ad139ee0d35d8945b307b0fdbc2b Mon Sep 17 00:00:00 2001 From: Bruno Alexandre Rosa <1791393+brunoalr@users.noreply.github.com> Date: Fri, 3 Oct 2025 18:57:17 -0300 Subject: [PATCH] generate triplet file in compile.sh --- .ci/compile.sh | 13 ++++++++++--- cmake/triplets/x64-osx-13.cmake | 12 ------------ 2 files changed, 10 insertions(+), 15 deletions(-) delete mode 100644 cmake/triplets/x64-osx-13.cmake diff --git a/.ci/compile.sh b/.ci/compile.sh index 14ec88146..f3c30b886 100755 --- a/.ci/compile.sh +++ b/.ci/compile.sh @@ -11,7 +11,7 @@ # --debug or --release sets the build type ie CMAKE_BUILD_TYPE # --ccache [] uses ccache and shows stats, optionally provide size # --dir sets the name of the build dir, default is "build" -# --target-macos-version sets the min os version - only used for macOS +# --target-macos-version sets the min os version - only used for x86 (Intel) macOS builds # uses env: BUILDTYPE MAKE_INSTALL MAKE_PACKAGE PACKAGE_TYPE PACKAGE_SUFFIX MAKE_SERVER MAKE_TEST USE_CCACHE CCACHE_SIZE BUILD_DIR CMAKE_GENERATOR # (correspond to args: --debug/--release --install --package --suffix --server --test --ccache --dir ) # exitcode: 1 for failure, 3 for invalid arguments @@ -127,9 +127,16 @@ if [[ $PACKAGE_TYPE ]]; then flags+=("-DCPACK_GENERATOR=$PACKAGE_TYPE") fi if [[ $TARGET_MACOS_VERSION ]]; then - flags+=("-DCMAKE_OSX_DEPLOYMENT_TARGET=$TARGET_MACOS_VERSION") - flags+=("-DVCPKG_TARGET_TRIPLET=x64-osx-13") + mkdir -p ../cmake/triplets + cp ../vcpkg/triplets/x64-osx.cmake ../cmake/triplets/x64-osx-${TARGET_MACOS_VERSION}.cmake + echo "set(VCPKG_CMAKE_SYSTEM_VERSION ${TARGET_MACOS_VERSION})" >> ../cmake/triplets/x64-osx-${TARGET_MACOS_VERSION}.cmake + echo "set(VCPKG_OSX_DEPLOYMENT_TARGET ${TARGET_MACOS_VERSION})" >> ../cmake/triplets/x64-osx-${TARGET_MACOS_VERSION}.cmake flags+=("-DVCPKG_OVERLAY_TRIPLETS=../cmake/triplets") + flags+=("-DVCPKG_TARGET_TRIPLET=x64-osx-${TARGET_MACOS_VERSION}") + flags+=("-DCMAKE_OSX_DEPLOYMENT_TARGET=${TARGET_MACOS_VERSION}") + echo "::group::Show generated triplet" + cat ../cmake/triplets/x64-osx-${TARGET_MACOS_VERSION}.cmake + echo "::endgroup::" fi # Add cmake --build flags diff --git a/cmake/triplets/x64-osx-13.cmake b/cmake/triplets/x64-osx-13.cmake deleted file mode 100644 index a60829399..000000000 --- a/cmake/triplets/x64-osx-13.cmake +++ /dev/null @@ -1,12 +0,0 @@ -# copied from vcpkg/triplets/x64-osx.cmake -set(VCPKG_TARGET_ARCHITECTURE x64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE static) - -set(VCPKG_CMAKE_SYSTEM_NAME Darwin) -set(VCPKG_OSX_ARCHITECTURES x86_64) -# end of copied code - -# Set the minimum macOS version for all dependencies -set(VCPKG_CMAKE_SYSTEM_VERSION 13.0) -set(VCPKG_OSX_DEPLOYMENT_TARGET 13.0)