Skip to content

Update build scripts for Windows builds #1843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

Update build scripts for Windows builds #1843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5358e6c
Update to newer OpenCV version to fix build issues in protobuf depend…
fnuecke Mar 14, 2025
abb348b
Fix path in OpenSfM build logic when using VS 2022.
fnuecke Mar 14, 2025
2978d69
Add missing dependency to dateutils for python venv.
fnuecke Mar 14, 2025
13af2b0
Hacky fix to make OpenCV dll (cv2.*.pyd) load properly. Fails if impo…
fnuecke Mar 14, 2025
960decb
Rework patch to OpenSfM build config to still support VS 16 (v142 too…
fnuecke Mar 17, 2025
c64c77d
Add python version sanity check for PDAL, since resulting library wil…
fnuecke Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SuperBuild/cmake/External-OpenCV.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ ExternalProject_Add(${_proj_name}
STAMP_DIR ${_SB_BINARY_DIR}/stamp
#--Download step--------------
DOWNLOAD_DIR ${SB_DOWNLOAD_DIR}
URL https://github.com/opencv/opencv/archive/4.5.0.zip
URL https://github.com/opencv/opencv/archive/4.11.0.zip
#--Update/Patch step----------
UPDATE_COMMAND ""
#--Configure step-------------
Expand Down
8 changes: 7 additions & 1 deletion SuperBuild/cmake/External-OpenSfM.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@ ProcessorCount(nproc)

set(EXTRA_INCLUDE_DIRS "")
if(WIN32)
set(OpenCV_DIR "${SB_INSTALL_DIR}/x64/vc16/lib")
if (MSVC_TOOLSET_VERSION EQUAL 143)
set(OpenCV_DIR "${SB_INSTALL_DIR}/x64/vc17/lib")
elseif(MSVC_TOOLSET_VERSION EQUAL 142)
set(OpenCV_DIR "${SB_INSTALL_DIR}/x64/vc16/lib")
else()
message(FATAL_ERROR "Unsupported MSVC toolset version detected: ${MSVC_TOOLSET_VERSION}")
endif()
set(BUILD_CMD ${CMAKE_COMMAND} --build "${SB_BUILD_DIR}/opensfm" --config "${CMAKE_BUILD_TYPE}")
else()
set(BUILD_CMD make "-j${nproc}")
Expand Down
6 changes: 6 additions & 0 deletions SuperBuild/cmake/External-PDALPython.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ if (WIN32)
-DPython3_NumPy_INCLUDE_DIRS=${PYTHON_HOME}/lib/site-packages/numpy/core/include)
endif()

execute_process(COMMAND ${PYTHON_EXE_PATH} "-V" OUTPUT_VARIABLE PYTHON_VERSION)
string(STRIP ${PYTHON_VERSION} PYTHON_VERSION)
if(NOT (${PYTHON_VERSION} MATCHES "Python 3.8.1"))
message(FATAL_ERROR "Python 3.8.1 is bundled with ODM. To avoid version mismatches in built PDALPython libraries, please ensure this exact version is used during the build. Detected version: ${PYTHON_VERSION} (at ${PYTHON_EXE_PATH}).")
endif()

ExternalProject_Add(${_proj_name}
DEPENDS pdal
PREFIX ${_SB_BINARY_DIR}
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,4 @@ codem==0.24.0
trimesh==3.17.1
pandas==1.5.2
piexif==1.1.3
python-dateutil==2.9.0
3 changes: 3 additions & 0 deletions run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
print("Ups! ODM needs to run with Python 3. It seems you launched it with Python 2. Try using: python3 run.py ... ")
sys.exit(1)

# Hack: early import cv2 because PIL init will break DLL loading.
import cv2

import os
from opendm import log
from opendm import config
Expand Down