Skip to content

Commit

Permalink
remove more vendored deps
Browse files Browse the repository at this point in the history
  • Loading branch information
Maxxen committed Nov 25, 2024
1 parent 2aa7816 commit 0191692
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 56 deletions.
56 changes: 2 additions & 54 deletions deps/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ set(PATCH_NAME_ENDING )
if (EMSCRIPTEN)
set(CMAKE_FLAGS_POINTER_SIZE -DCMAKE_SIZEOF_VOID_P=4 -DCMAKE_SIZEOF_VOIDP=4)
set(CMAKE_PROJ_FLAGS -DCMAKE_MODULE_PATH=${LOCAL_INSTALL_DIR}/lib/cmake -DSQLITE3_INCLUDE_DIR=${LOCAL_INSTALL_DIR}/include -DSQLITE3_LIBRARY=${LOCAL_INSTALL_DIR}/lib/libsqlite3.a)
set(CMAKE_GDAL_FLAGS -DACCEPT_MISSING_LINUX_FS_HEADER=ON -DSIZEOF_INT=4 -DSIZEOF_UNSIGNED_LONG=4 -DSIZEOF_OFF_T=4 -DGEOS_DIR=${LOCAL_INSTALL_DIR}/lib/cmake/geos -DGeographicLib_DIR=${LOCAL_INSTALL_DIR}/lib/cmake/GeographicLib -DSQLITE3_LIBRARY=${LOCAL_INSTALL_DIR}/lib/libsqlite3.a)
set(CMAKE_GDAL_FLAGS -DACCEPT_MISSING_LINUX_FS_HEADER=ON -DSIZEOF_INT=4 -DSIZEOF_UNSIGNED_LONG=4 -DSIZEOF_OFF_T=4 -DSQLITE3_LIBRARY=${LOCAL_INSTALL_DIR}/lib/libsqlite3.a)
set(PATCH_NAME_ENDING _wasm)
set(OGR_ENABLE_DRIVER_OPENFILEGDB OFF)
endif()
Expand Down Expand Up @@ -158,59 +158,7 @@ ExternalProject_Add(
)
set(GDAL_DEPENDENCIES ${GDAL_DEPENDENCIES} EXPAT)


# GEOS
ExternalProject_Add(
GEOS
URL ${CMAKE_CURRENT_SOURCE_DIR}/vendor/geos-3.13.0.tar.bz2
CONFIGURE_HANDLED_BY_BUILD TRUE
CMAKE_ARGS
# CMake options
-DCMAKE_INSTALL_PREFIX:PATH=${LOCAL_INSTALL_DIR}
-DCMAKE_PREFIX_PATH=${LOCAL_INSTALL_DIR}
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES_PACKED}
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
${CMAKE_FLAGS_POINTER_SIZE}
# vcpkg options
-DVCPKG_MANIFEST_DIR='${VCPKG_MANIFEST_DIR}'
-DVCPKG_INSTALLED_DIR='${VCPKG_INSTALLED_DIR}'
-DCMAKE_TOOLCHAIN_FILE='${CMAKE_TOOLCHAIN_FILE}'
-DVCPKG_TARGET_TRIPLET='${VCPKG_TARGET_TRIPLET}'
-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE='${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}'
# GEOS options
-DBUILD_SHARED_LIBS=OFF
-DBUILD_TESTING=OFF
-DBUILD_DOCUMENTATION=OFF
-DBUILD_ASTYLE=OFF
-DBUILD_GEOSOP=OFF
)
set(GDAL_DEPENDENCIES ${GDAL_DEPENDENCIES} GEOS)

# GeographicLib
ExternalProject_Add(
GEOGRAPHICLIB
URL ${CMAKE_CURRENT_SOURCE_DIR}/vendor/GeographicLib-2.2.zip
CONFIGURE_HANDLED_BY_BUILD TRUE
PATCH_COMMAND patch -p1 < "${CMAKE_CURRENT_LIST_DIR}/patches/geographiclib${PATCH_NAME_ENDING}.patch"
CMAKE_ARGS
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_INSTALL_PREFIX:PATH=${LOCAL_INSTALL_DIR}
-DCMAKE_PREFIX_PATH=${LOCAL_INSTALL_DIR}
-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES_PACKED}
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
${CMAKE_FLAGS_POINTER_SIZE}
# vcpkg options
-DVCPKG_MANIFEST_DIR='${VCPKG_MANIFEST_DIR}'
-DVCPKG_INSTALLED_DIR='${VCPKG_INSTALLED_DIR}'
-DCMAKE_TOOLCHAIN_FILE='${CMAKE_TOOLCHAIN_FILE}'
-DVCPKG_TARGET_TRIPLET='${VCPKG_TARGET_TRIPLET}'
-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE='${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}'
# GeographicLib options
-DBUILD_SHARED_LIBS=OFF
-DGEOGRAPHICLIB_DATA=${LOCAL_INSTALL_DIR}/share/GeographicLib
-DBUILD_DOCUMENTATION=OFF
)
set(GDAL_DEPENDENCIES ${GDAL_DEPENDENCIES})

# GDAL
ExternalProject_Add(
Expand Down
Binary file removed deps/vendor/GeographicLib-2.2.zip
Binary file not shown.
Binary file removed deps/vendor/apache-arrow-10.0.1.zip
Binary file not shown.
Binary file removed deps/vendor/geos-3.13.0.tar.bz2
Binary file not shown.
Binary file removed deps/vendor/openssl-openssl-3.0.7.zip
Binary file not shown.
Binary file removed deps/vendor/zlib1213.zip
Binary file not shown.
6 changes: 4 additions & 2 deletions vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"dependencies": [
"openssl",
"zlib"
"openssl",
"zlib",
"geos",
"geographiclib"
]
}

0 comments on commit 0191692

Please sign in to comment.