kopia lustrzana https://github.com/OpenDroneMap/ODM
attempt to recreate commit d7aa621c3d
, in which pdal-python successfully found numpy
rodzic
2df4db4e22
commit
29e945687e
|
@ -58,10 +58,10 @@ jobs:
|
|||
with:
|
||||
python-version: '3.12.10'
|
||||
architecture: 'x64'
|
||||
- uses: Jimver/cuda-toolkit@v0.2.24
|
||||
id: cuda-toolkit
|
||||
with:
|
||||
cuda: '12.8.1'
|
||||
# - uses: Jimver/cuda-toolkit@v0.2.24
|
||||
# id: cuda-toolkit
|
||||
# with:
|
||||
# cuda: '12.8.1'
|
||||
- name: Setup cmake
|
||||
uses: jwlawson/actions-setup-cmake@v1.13
|
||||
with:
|
||||
|
|
|
@ -2,9 +2,8 @@ set(_proj_name pdal-python)
|
|||
set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}")
|
||||
|
||||
if (WIN32)
|
||||
set(PP_EXTRA_ARGS -DPython3_EXECUTABLE=${PYTHON_EXE_PATH}
|
||||
-DPython3_ROOT_DIR=${PYTHON_HOME}
|
||||
-DPython3_NumPy_INCLUDE_DIRS=${PYTHON_HOME}/Lib/site-packages/numpy/_core/include)
|
||||
set(PP_EXTRA_ARGS -DPYTHON3_EXECUTABLE=${PYTHON_EXE_PATH}
|
||||
-DPython3_ROOT_DIR=${PYTHON_HOME})
|
||||
else()
|
||||
set(PP_EXTRA_ARGS -DPython3_EXECUTABLE=${PYTHON_EXE_PATH}
|
||||
-DPython3_NumPy_INCLUDE_DIRS=${PYTHON_HOME}/lib/python3.12/site-packages/numpy/_core/include)
|
||||
|
|
|
@ -26,7 +26,7 @@ parser.add_argument('--build-vcpkg',
|
|||
help='Build VCPKG environment from scratch instead of downloading prebuilt one.')
|
||||
parser.add_argument('--vcpkg-archive-url',
|
||||
type=str,
|
||||
default='https://github.com/NathanMOlson/windows-deps/releases/download/2025-8-22a/vcpkg-export.zip',
|
||||
default='https://github.com/NathanMOlson/windows-deps/releases/download/2025-8-21/vcpkg-export.zip',
|
||||
required=False,
|
||||
help='Path to VCPKG export archive')
|
||||
parser.add_argument('--code-sign-cert-path',
|
||||
|
@ -68,6 +68,7 @@ def build():
|
|||
ebuilder = EnvBuilder(with_pip=True)
|
||||
ebuilder.create("venv")
|
||||
|
||||
run("pip install setuptools")
|
||||
run("venv\\Scripts\\pip install --ignore-installed -r requirements.txt")
|
||||
|
||||
# Download / build VCPKG environment
|
||||
|
@ -104,7 +105,7 @@ def build():
|
|||
|
||||
toolchain_file = os.path.join(os.getcwd(), "vcpkg", "scripts", "buildsystems", "vcpkg.cmake")
|
||||
run("cmake .. -DCMAKE_TOOLCHAIN_FILE=\"%s\"" % toolchain_file, cwd=build_dir)
|
||||
run("cmake --build . --config Release -j2", cwd=build_dir)
|
||||
run("cmake --build . --config Release -j2 --target pdal-python", cwd=build_dir)
|
||||
|
||||
def vcpkg_export():
|
||||
if not os.path.exists("vcpkg"):
|
||||
|
|
Ładowanie…
Reference in New Issue