diff --git a/ports/liblas/portfile.cmake b/ports/liblas/portfile.cmake index ac41485619..dfb1f332e1 100644 --- a/ports/liblas/portfile.cmake +++ b/ports/liblas/portfile.cmake @@ -1,12 +1,9 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -set(VERSION 1.8.1) - vcpkg_download_distfile(ARCHIVE - URLS "http://download.osgeo.org/liblas/libLAS-${VERSION}.tar.bz2" + URLS "https://download.osgeo.org/liblas/libLAS-${VERSION}.tar.bz2" FILENAME "libLAS-${VERSION}-src.tar.bz2" - SHA512 1cb39c557af0006c54f1100d0d409977fcc1886abd155c1b144d806c47f8675a9f2125d3a9aca16bae65d2aabba84d5e5e322b42085e7db312f3d53f92342acf - HEAD_REF master + SHA512 1cb39c557af0006c54f1100d0d409977fcc1886abd155c1b144d806c47f8675a9f2125d3a9aca16bae65d2aabba84d5e5e322b42085e7db312f3d53f92342acf ) vcpkg_extract_source_archive( @@ -26,7 +23,7 @@ file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - tools WITH_UTILITIES + tools WITH_UTILITIES ) vcpkg_cmake_configure( @@ -47,9 +44,9 @@ else() vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/libLAS) endif() -vcpkg_replace_string ("${CURRENT_PACKAGES_DIR}/share/liblas/liblas-config.cmake" "_DIR}/.." "_DIR}/../..") -vcpkg_replace_string ("${CURRENT_PACKAGES_DIR}/share/liblas/liblas-config.cmake" "\${PROJECT_ROOT_DIR}/lib" "\${PROJECT_ROOT_DIR}/$<$:/debug>/lib") -vcpkg_replace_string ("${CURRENT_PACKAGES_DIR}/share/liblas/liblas-config.cmake" "\${PROJECT_ROOT_DIR}/bin" "\${PROJECT_ROOT_DIR}/tools/${PORT}") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/liblas/liblas-config.cmake" "_DIR}/.." "_DIR}/../..") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/liblas/liblas-config.cmake" "\${PROJECT_ROOT_DIR}/lib" "\${PROJECT_ROOT_DIR}/$<$:/debug>/lib") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/liblas/liblas-config.cmake" "\${PROJECT_ROOT_DIR}/bin" "\${PROJECT_ROOT_DIR}/tools/${PORT}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" @@ -65,4 +62,4 @@ if(WITH_UTILITIES) endif() file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/liblas/vcpkg.json b/ports/liblas/vcpkg.json index fd0221ed59..acba8c81cf 100644 --- a/ports/liblas/vcpkg.json +++ b/ports/liblas/vcpkg.json @@ -1,7 +1,7 @@ { "name": "liblas", "version": "1.8.1", - "port-version": 16, + "port-version": 17, "description": "A C/C++ library for reading and writing the very common LAS LiDAR format.", "license": null, "supports": "!arm & !staticcrt", diff --git a/versions/baseline.json b/versions/baseline.json index 2a926c3473..0739cae5b9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5246,7 +5246,7 @@ }, "liblas": { "baseline": "1.8.1", - "port-version": 16 + "port-version": 17 }, "liblbfgs": { "baseline": "1.10", diff --git a/versions/l-/liblas.json b/versions/l-/liblas.json index 0a44697b93..1868211fb9 100644 --- a/versions/l-/liblas.json +++ b/versions/l-/liblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b9bfae7c0cc4280a85ff0359cc01d92e9e249b57", + "version": "1.8.1", + "port-version": 17 + }, { "git-tree": "d5b760d509ff1efdb358f14e344c608768746e95", "version": "1.8.1",