kopia lustrzana https://github.com/OpenDroneMap/ODM
Moved OpenSfM, tune down ceres logging
rodzic
50b258b9e8
commit
6fd2533e81
|
@ -51,7 +51,7 @@ if (WIN32)
|
|||
message(FATAL_ERROR "CMAKE_TOOLCHAIN_FILE not set. You need to set it to the path of vcpkg.cmake")
|
||||
endif()
|
||||
get_filename_component(CMAKE_TOOLCHAIN_DIR ${CMAKE_TOOLCHAIN_FILE} DIRECTORY)
|
||||
set(VCPKG_ROOT "${CMAKE_TOOLCHAIN_DIR}/../../")
|
||||
get_filename_component(VCPKG_ROOT "${CMAKE_TOOLCHAIN_DIR}/../../" ABSOLUTE)
|
||||
set(WIN32_CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
|
||||
set(PYTHON_HOME "${SB_ROOT_DIR}/../venv")
|
||||
set(PYTHON_EXE_PATH "${PYTHON_HOME}/Scripts/python")
|
||||
|
|
|
@ -19,6 +19,7 @@ ExternalProject_Add(${_proj_name}
|
|||
-DBUILD_EXAMPLES=OFF
|
||||
-DBUILD_TESTING=OFF
|
||||
-DMINIGLOG=ON
|
||||
-DMINIGLOG_MAX_LOG_LEVEL=-100
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
|
||||
${WIN32_CMAKE_ARGS}
|
||||
#--Build step-----------------
|
||||
|
|
|
@ -24,7 +24,7 @@ ExternalProject_Add(${_proj_name}
|
|||
UPDATE_COMMAND git submodule update --init --recursive
|
||||
#--Configure step-------------
|
||||
SOURCE_DIR ${SB_INSTALL_DIR}/bin/${_proj_name}
|
||||
CONFIGURE_COMMAND cmake <SOURCE_DIR>/${_proj_name}/src
|
||||
CONFIGURE_COMMAND ${CMAKE_COMMAND} <SOURCE_DIR>/${_proj_name}/src
|
||||
-DCERES_ROOT_DIR=${SB_INSTALL_DIR}
|
||||
-DOpenCV_DIR=${OpenCV_DIR}
|
||||
-DADDITIONAL_INCLUDE_DIRS=${SB_INSTALL_DIR}/include
|
||||
|
|
|
@ -13,14 +13,14 @@ superbuild_bin_path = os.path.join(superbuild_path, 'install', 'bin')
|
|||
python_packages_paths = [os.path.join(superbuild_path, p) for p in [
|
||||
'install/lib/python3.8/dist-packages',
|
||||
'install/lib/python3/dist-packages',
|
||||
'src/opensfm'
|
||||
'install/bin/opensfm'
|
||||
]]
|
||||
for p in python_packages_paths:
|
||||
sys.path.append(p)
|
||||
|
||||
|
||||
# define opensfm path
|
||||
opensfm_path = os.path.join(superbuild_path, "src/opensfm")
|
||||
opensfm_path = os.path.join(superbuild_bin_path, "opensfm")
|
||||
|
||||
poisson_recon_path = os.path.join(superbuild_bin_path, 'PoissonRecon')
|
||||
dem2mesh_path = os.path.join(superbuild_bin_path, 'dem2mesh')
|
||||
|
|
Ładowanie…
Reference in New Issue