blueloveTH 1 рік тому
батько
коміт
6dcc7ba8aa
2 змінених файлів з 20 додано та 6 видалено
  1. 14 5
      3rd/numpy/CMakeLists.txt
  2. 6 1
      3rd/numpy/tests/test_numpy.py

+ 14 - 5
3rd/numpy/CMakeLists.txt

@@ -37,8 +37,17 @@ add_library(${PROJECT_NAME} SHARED ${SOURCES})
 target_compile_definitions(${PROJECT_NAME} PRIVATE PY_DYNAMIC_MODULE)
 
 # Link numpy with pocketpy
-target_link_libraries(
-    ${PROJECT_NAME}
-    PRIVATE
-    ${CMAKE_CURRENT_LIST_DIR}/../..//build/Release/pocketpy.lib
-)
+if(WIN32)
+    target_link_libraries(
+        ${PROJECT_NAME}
+        PRIVATE
+        ${CMAKE_CURRENT_LIST_DIR}/../../build/Release/pocketpy.lib
+    )
+else()
+    target_link_libraries(
+        ${PROJECT_NAME}
+        PRIVATE
+        ${CMAKE_CURRENT_LIST_DIR}/../../build/libpocketpy.so
+    )
+endif()
+

+ 6 - 1
3rd/numpy/tests/test_numpy.py

@@ -1,10 +1,15 @@
 import math
+import sys
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     import numpy as np
 else:
-    np = __import__('E:/pocketpy/3rd/numpy/build/Release/numpy.dll')
+    if sys.platform == 'win32':
+        path = 'E:/pocketpy/3rd/numpy/build/Release/numpy.dll'
+    else:
+        path = '/mnt/e/pocketpy/3rd/numpy/build/libnumpy.so'
+    np = __import__(path)
 
 def assert_equal(a, b):
     assert (a == b).all()