mirror of https://github.com/microsoft/vcpkg.git
[vcpkg baseline][pdal] Devendor libe57format (#51878)
This commit is contained in:
parent
69ebe0cdad
commit
360e141bf4
|
|
@ -14,15 +14,14 @@ vcpkg_cmake_configure(
|
|||
-DE57_BUILD_TEST=OFF
|
||||
-DE57_BUILD_SHARED=${E57_BUILD_SHARED}
|
||||
-DE57_RELEASE_LTO=OFF
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_Git=1
|
||||
)
|
||||
vcpkg_cmake_install()
|
||||
|
||||
vcpkg_cmake_config_fixup(PACKAGE_NAME E57Format CONFIG_PATH "lib/cmake/E57Format")
|
||||
vcpkg_cmake_config_fixup(PACKAGE_NAME e57format CONFIG_PATH "lib/cmake/E57Format")
|
||||
|
||||
file(REMOVE_RECURSE
|
||||
"${CURRENT_PACKAGES_DIR}/debug/include"
|
||||
"${CURRENT_PACKAGES_DIR}/debug/share"
|
||||
)
|
||||
|
||||
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
libe57format provides CMake targets:
|
||||
|
||||
find_package(E57Format CONFIG REQUIRED)
|
||||
target_link_libraries(main PRIVATE E57Format)
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"name": "libe57format",
|
||||
"version": "3.3.0",
|
||||
"port-version": 1,
|
||||
"description": "A library to provide read & write support for the E57 file format.",
|
||||
"homepage": "https://github.com/asmaloney/libE57Format",
|
||||
"license": "BSL-1.0",
|
||||
|
|
@ -13,6 +14,9 @@
|
|||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
},
|
||||
"xerces-c"
|
||||
{
|
||||
"name": "xerces-c",
|
||||
"default-features": false
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -186,6 +186,35 @@ index a328f34..bedb367 100644
|
|||
nanoflann::SearchParams params;
|
||||
params.sorted = true;
|
||||
|
||||
diff --git a/plugins/e57/CMakeLists.txt b/plugins/e57/CMakeLists.txt
|
||||
index a94ab26..1d15330 100644
|
||||
--- a/plugins/e57/CMakeLists.txt
|
||||
+++ b/plugins/e57/CMakeLists.txt
|
||||
@@ -7,7 +7,7 @@ if (STANDALONE)
|
||||
endif(STANDALONE)
|
||||
|
||||
|
||||
-add_subdirectory(libE57Format)
|
||||
+find_package(e57format CONFIG REQUIRED)
|
||||
|
||||
PDAL_ADD_PLUGIN(e57plugin_reader reader e57
|
||||
FILES
|
||||
@@ -21,7 +21,6 @@ PDAL_ADD_PLUGIN(e57plugin_reader reader e57
|
||||
E57Format
|
||||
${PDAL_LIBRARIES}
|
||||
INCLUDES
|
||||
- libE57Format/include
|
||||
)
|
||||
target_compile_definitions(${e57plugin_reader}
|
||||
PRIVATE
|
||||
@@ -38,7 +37,6 @@ PDAL_ADD_PLUGIN(e57plugin_writer writer e57
|
||||
E57Format
|
||||
${PDAL_LIBRARIES}
|
||||
INCLUDES
|
||||
- libE57Format/include
|
||||
)
|
||||
|
||||
if (WITH_TESTS)
|
||||
diff --git a/tools/lasdump/CMakeLists.txt b/tools/lasdump/CMakeLists.txt
|
||||
index fa842d1..a9f4e7a 100644
|
||||
--- a/tools/lasdump/CMakeLists.txt
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ file(REMOVE_RECURSE
|
|||
"${SOURCE_PATH}/cmake/modules/FindGeoTIFF.cmake"
|
||||
"${SOURCE_PATH}/cmake/modules/FindICONV.cmake"
|
||||
"${SOURCE_PATH}/cmake/modules/FindZSTD.cmake"
|
||||
"${SOURCE_PATH}/plugins/e57/libE57Format"
|
||||
"${SOURCE_PATH}/vendor/eigen"
|
||||
"${SOURCE_PATH}/vendor/h3"
|
||||
"${SOURCE_PATH}/vendor/nanoflann"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"name": "pdal",
|
||||
"version": "2.10.1",
|
||||
"port-version": 1,
|
||||
"description": "PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.",
|
||||
"homepage": "https://pdal.org/",
|
||||
"license": null,
|
||||
|
|
@ -53,7 +54,11 @@
|
|||
"e57": {
|
||||
"description": "Build the E57 plugin",
|
||||
"dependencies": [
|
||||
"xerces-c"
|
||||
"libe57format",
|
||||
{
|
||||
"name": "xerces-c",
|
||||
"default-features": false
|
||||
}
|
||||
]
|
||||
},
|
||||
"hdf": {
|
||||
|
|
|
|||
|
|
@ -4934,7 +4934,7 @@
|
|||
},
|
||||
"libe57format": {
|
||||
"baseline": "3.3.0",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"libebur128": {
|
||||
"baseline": "1.2.6",
|
||||
|
|
@ -7666,7 +7666,7 @@
|
|||
},
|
||||
"pdal": {
|
||||
"baseline": "2.10.1",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"pdal-c": {
|
||||
"baseline": "2.2.0",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "d70380f61673c26328c29757d9782cff3fd15313",
|
||||
"version": "3.3.0",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "acedbc30dc167102ae07154115198f79fe62eb6c",
|
||||
"version": "3.3.0",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "20de08b78885faf9ab1e155bff63a62a627df473",
|
||||
"version": "2.10.1",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "1397d7385b744a9418374625b97927a3b74dddf5",
|
||||
"version": "2.10.1",
|
||||
|
|
|
|||
Loading…
Reference in New Issue