diff --git a/ports/liblas/portfile.cmake b/ports/liblas/portfile.cmake index a50ede2f61d2f8..3d2e5e1d977192 100644 --- a/ports/liblas/portfile.cmake +++ b/ports/liblas/portfile.cmake @@ -8,18 +8,17 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive_ex( - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" OUT_SOURCE_PATH SOURCE_PATH PATCHES fix-boost-headers.patch ) -file(REMOVE ${SOURCE_PATH}/cmake/modules/FindPROJ4.cmake) -file(REMOVE ${SOURCE_PATH}/cmake/modules/FindGeoTIFF.cmake) +file(REMOVE "${SOURCE_PATH}/cmake/modules/FindPROJ4.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/modules/FindGeoTIFF.cmake") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_OSGEO4W=OFF # Disable osgeo4w -DWITH_TESTS=OFF @@ -28,24 +27,24 @@ vcpkg_configure_cmake( -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=${CMAKE_DISABLE_FIND_PACKAGE_JPEG} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/doc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/doc) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/doc") if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/share/cmake/libLAS/liblas-depends.cmake) +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/share/cmake/libLAS/liblas-depends.cmake") if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/libLAS) + vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/libLAS) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/liblas/vcpkg.json b/ports/liblas/vcpkg.json index 049580bde09398..5d74aa79222d60 100644 --- a/ports/liblas/vcpkg.json +++ b/ports/liblas/vcpkg.json @@ -1,8 +1,10 @@ { "name": "liblas", "version": "1.8.1", - "port-version": 9, + "port-version": 10, "description": "A C/C++ library for reading and writing the very common LAS LiDAR format.", + "license": "BSD-3-Clause", + "supports": "!arm", "dependencies": [ "boost-detail", "boost-filesystem", @@ -14,7 +16,15 @@ "boost-system", "boost-thread", "boost-uuid", - "libgeotiff" + "libgeotiff", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "jpeg": { diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index c512c024c598f6..0a235a8fea18a4 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -449,7 +449,6 @@ libigl:x64-uwp=fail libirecovery:x64-windows-static-md=fail # 120 min build time for libjxl arm-uwp-rel, reason unknown libjxl:arm-uwp=skip -liblas:arm64-windows=fail liblemon:arm-uwp=fail liblemon:x64-uwp=fail liblo:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 97455e536ccbe6..6796743b4ae84c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3746,7 +3746,7 @@ }, "liblas": { "baseline": "1.8.1", - "port-version": 9 + "port-version": 10 }, "liblbfgs": { "baseline": "1.10", diff --git a/versions/l-/liblas.json b/versions/l-/liblas.json index 547d1f6321b2c9..bbb3eb8e0c8269 100644 --- a/versions/l-/liblas.json +++ b/versions/l-/liblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2298191e0c3e2866daf3b199bc8046c9a25f37fa", + "version": "1.8.1", + "port-version": 10 + }, { "git-tree": "9d89f6e4515fcd144d24a7e619ea2de26799a005", "version": "1.8.1",