From f579f4c7d24b2014122df01bc5d8c242844322dc Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 6 Oct 2022 00:01:43 +0200 Subject: [PATCH] [xeus] fix arm64-osx build (#27097) --- ports/xeus/portfile.cmake | 10 +++++----- ports/xeus/vcpkg.json | 13 +++++++++++-- versions/baseline.json | 2 +- versions/x-/xeus.json | 5 +++++ 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/ports/xeus/portfile.cmake b/ports/xeus/portfile.cmake index 85ffb5e8bd..b790d4d291 100644 --- a/ports/xeus/portfile.cmake +++ b/ports/xeus/portfile.cmake @@ -11,9 +11,8 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBS) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXAMPLES=OFF -DXEUS_BUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} @@ -21,13 +20,14 @@ vcpkg_configure_cmake( -DBUILD_TESTS=OFF -DDOWNLOAD_GTEST=OFF -DDISABLE_ARCH_NATIVE=OFF + -DXEUS_DISABLE_ARCH_NATIVE=On ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/xeus/vcpkg.json b/ports/xeus/vcpkg.json index 178c6e7163..89f8f67ad2 100644 --- a/ports/xeus/vcpkg.json +++ b/ports/xeus/vcpkg.json @@ -1,9 +1,10 @@ { "name": "xeus", - "version-string": "0.24.3", - "port-version": 1, + "version": "0.24.3", + "port-version": 2, "description": "C++ implementation of the Jupyter kernel protocol", "homepage": "https://github.com/jupyter-xeus/xeus", + "license": "BSD-3-Clause", "dependencies": [ "cppzmq", { @@ -12,6 +13,14 @@ }, "nlohmann-json", "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "xtl", "zeromq" ] diff --git a/versions/baseline.json b/versions/baseline.json index c94a270c96..f7519698ef 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7934,7 +7934,7 @@ }, "xeus": { "baseline": "0.24.3", - "port-version": 1 + "port-version": 2 }, "xframe": { "baseline": "0.3.0", diff --git a/versions/x-/xeus.json b/versions/x-/xeus.json index ddd6614a97..15c72b6b7d 100644 --- a/versions/x-/xeus.json +++ b/versions/x-/xeus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58ccbb03903ad023da77a9a53225dc4bd25df600", + "version": "0.24.3", + "port-version": 2 + }, { "git-tree": "2bb5d11153c9982aad5337c44d2f781918e8d991", "version-string": "0.24.3",