From ef793cbe59e1bbc7521615ad0ae02c836105e13c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20G=2E=20Barna?= <cremindes@gmail.com> Date: Fri, 23 Jul 2021 06:58:32 +0200 Subject: [PATCH] [laszip] Migrate LASzip to the new manifest format. (#18614) * Migrate LASzip to the new manifest format. - CONTROL -> vcpkg.json - vcpkg_configure_cmake -> vcpkg_cmake_configure - vcpkg_install_cmake -> vcpkg_cmake_install * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/laszip/CONTROL | 3 --- ports/laszip/portfile.cmake | 13 ++++++------- ports/laszip/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 2 +- versions/l-/laszip.json | 5 +++++ 5 files changed, 29 insertions(+), 11 deletions(-) delete mode 100644 ports/laszip/CONTROL create mode 100644 ports/laszip/vcpkg.json diff --git a/ports/laszip/CONTROL b/ports/laszip/CONTROL deleted file mode 100644 index 91d94fd1613490..00000000000000 --- a/ports/laszip/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: laszip -Version: 3.4.3 -Description: LASzip - free and lossless LiDAR compression diff --git a/ports/laszip/portfile.cmake b/ports/laszip/portfile.cmake index 0628411a8bfa08..de6508db06038b 100644 --- a/ports/laszip/portfile.cmake +++ b/ports/laszip/portfile.cmake @@ -8,19 +8,18 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LASZIP_BUILD_STATIC) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DLASZIP_BUILD_STATIC=${LASZIP_BUILD_STATIC} ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/laszip RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/laszip" RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Remove laszip_api3 dll since it doesn't export functions properly during build. -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/laszip_api3.dll) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/laszip_api3.dll) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/laszip_api3.dll") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/laszip_api3.dll") diff --git a/ports/laszip/vcpkg.json b/ports/laszip/vcpkg.json new file mode 100644 index 00000000000000..40e5268176411a --- /dev/null +++ b/ports/laszip/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "laszip", + "version": "3.4.3", + "port-version": 1, + "description": "LASzip - free and lossless LiDAR compression", + "homepage": "https://laszip.org/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 132ff07983dfbb..807e2791028c29 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2986,7 +2986,7 @@ }, "laszip": { "baseline": "3.4.3", - "port-version": 0 + "port-version": 1 }, "lazy-importer": { "baseline": "2019-08-10", diff --git a/versions/l-/laszip.json b/versions/l-/laszip.json index 439d021733cecb..17df9cf1fbe019 100644 --- a/versions/l-/laszip.json +++ b/versions/l-/laszip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81b6a105440d08f2c29b044da3f0661e46ddb0a8", + "version": "3.4.3", + "port-version": 1 + }, { "git-tree": "6b7b406aadbae2a288bde7f2b268a7c302bfdf67", "version-string": "3.4.3",