Skip to content

Commit ce7d578

Browse files
committed
Try vcpkg GDAL
1 parent 3f14043 commit ce7d578

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

SuperBuild/CMakeLists.txt

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,29 +94,21 @@ if (WIN32)
9494
set(PYTHON_HOME "${SB_ROOT_DIR}/../venv")
9595
set(PYTHON_EXE_PATH "${PYTHON_HOME}/Scripts/python")
9696

97-
set(GDAL_ROOT "${SB_INSTALL_DIR}")
98-
set(GDAL_LIBRARY "${GDAL_ROOT}/lib/gdal.lib")
99-
set(GDAL_INCLUDE_DIR "${GDAL_ROOT}/include")
100-
10197
message("Copying VCPKG DLLs...")
10298
file(GLOB COPY_DLLS "${VCPKG_ROOT}/installed/x64-windows/bin/*.dll")
10399
file(COPY ${COPY_DLLS} DESTINATION "${SB_INSTALL_DIR}/bin")
104100

101+
# TODO: copy gdal tools
102+
105103
message("Copying CUDA DLLs...")
106104
file(GLOB CUDA_DLLS "$ENV{CUDA_PATH}/bin/cudart64*.dll")
107105
file(COPY ${CUDA_DLLS} DESTINATION "${SB_INSTALL_DIR}/bin")
108106
elseif(APPLE)
109107
set(PYTHON_HOME "${SB_ROOT_DIR}/../venv")
110108
set(PYTHON_EXE_PATH "${PYTHON_HOME}/bin/python")
111-
set(GDAL_ROOT "${SB_INSTALL_DIR}")
112-
set(GDAL_LIBRARY "${GDAL_ROOT}/lib/libgdal.dylib")
113-
set(GDAL_INCLUDE_DIR "${GDAL_ROOT}/include")
114109
else()
115110
set(PYTHON_HOME "${SB_ROOT_DIR}/../venv")
116111
set(PYTHON_EXE_PATH "${PYTHON_HOME}/bin/python3")
117-
set(GDAL_ROOT "${SB_INSTALL_DIR}")
118-
set(GDAL_LIBRARY "${GDAL_ROOT}/lib/libgdal.so")
119-
set(GDAL_INCLUDE_DIR "${GDAL_ROOT}/include")
120112
endif()
121113

122114
# Path to additional CMake modules
@@ -235,6 +227,7 @@ externalproject_add(dem2mesh
235227
PREFIX ${SB_BINARY_DIR}/dem2mesh
236228
SOURCE_DIR ${SB_SOURCE_DIR}/dem2mesh
237229
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
230+
${WIN32_CMAKE_ARGS}
238231
${APPLE_CMAKE_ARGS}
239232
)
240233

@@ -245,6 +238,7 @@ externalproject_add(dem2points
245238
PREFIX ${SB_BINARY_DIR}/dem2points
246239
SOURCE_DIR ${SB_SOURCE_DIR}/dem2points
247240
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
241+
${WIN32_CMAKE_ARGS}
248242
${APPLE_CMAKE_ARGS}
249243
)
250244

SuperBuild/cmake/External-Hexer.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ ExternalProject_Add(${_proj_name}
1515
SOURCE_DIR ${SB_SOURCE_DIR}/${_proj_name}
1616
CMAKE_ARGS
1717
-DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
18+
${WIN32_CMAKE_ARGS}
1819
#--Build step-----------------
1920
BINARY_DIR ${_SB_BINARY_DIR}
2021
#--Install step---------------

configure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
help='Build VCPKG environment from scratch instead of downloading prebuilt one.')
2727
parser.add_argument('--vcpkg-archive-url',
2828
type=str,
29-
default='https://github.com/OpenDroneMap/windows-deps/releases/download/2.6.1/vcpkg-export.zip',
29+
default='https://github.com/sylveon/windows-deps/releases/download/test/vcpkg-export.zip',
3030
required=False,
3131
help='Path to VCPKG export archive')
3232
parser.add_argument('--signtool-path',

0 commit comments

Comments
 (0)