Merge pull request #43 from open-vcpkg/fixnumpy

Fix numpy for macos
open-vcpkg · Oct 9, 2024 · 8f1c25f · 8f1c25f
2 parents a1ff436 + 2ff98d4
commit 8f1c25f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -68,6 +68,7 @@ jobs:
           VCPKG_OPTIONS="--overlay-ports="${{ github.workspace }}/ports" --host-triplet=${{ matrix.triplet }} --triplet=${{ matrix.triplet }}  --x-buildtrees-root=${{ env.buildtrees }}"
           ./vcpkg/vcpkg install $VCPKG_OPTIONS py-pip
           ./vcpkg/vcpkg install $VCPKG_OPTIONS py-sip
+          ./vcpkg/vcpkg install $VCPKG_OPTIONS py-numpy
           # ./vcpkg/vcpkg install $VCPKG_OPTIONS py-pyqt6
 
       - name: 📑 Upload logs

diff --git a/ports/py-cython/portfile.cmake b/ports/py-cython/portfile.cmake
@@ -11,8 +11,8 @@ vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}")
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
 
 if(NOT VCPKG_TARGET_IS_WINDOWS)
-  vcpkg_copy_tools(TOOL_NAMES cygdb cython cythonize DESTINATION "${CURRENT_PACKAGES_DIR}/${VCPKG_PYTHON3_SCRIPTS}" AUTO_CLEAN)
+  vcpkg_copy_tools(TOOL_NAMES cygdb cython cythonize DESTINATION "${CURRENT_PACKAGES_DIR}/tools/python3" AUTO_CLEAN)
 endif()
 
 set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
-set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled)
+set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled)
diff --git a/ports/py-cython/vcpkg.json b/ports/py-cython/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "py-cython",
   "version": "3.0.5",
+  "port-version": 1,
   "description": "Cython is a Python compiler that makes writing C extensions for Python as easy as Python itself. Cython is based on Pyrex, but supports more cutting edge functionality and optimizations.",
   "homepage": "https://cython.org/",
   "license": "Apache-2.0",