From c140a5520caa0bc3c899d47f427a29672ffb1aa2 Mon Sep 17 00:00:00 2001 From: Leander Schulten Date: Tue, 21 Jun 2022 01:36:37 +0200 Subject: [PATCH 01/12] [liblas] use supports expression --- ports/liblas/portfile.cmake | 33 ++++++++++++++++----------------- ports/liblas/vcpkg.json | 14 ++++++++++++-- scripts/ci.baseline.txt | 1 - versions/baseline.json | 2 +- versions/l-/liblas.json | 5 +++++ 5 files changed, 34 insertions(+), 21 deletions(-) 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 1d1447834c1eb6..c79f7940488efc 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -426,7 +426,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 290f7c1f6a8a8e..cb206d99e5e255 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3754,7 +3754,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", From b5035be95a7c827b7a528a964aa63b1f93c6bcc4 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sun, 10 Jul 2022 18:13:06 +0200 Subject: [PATCH 02/12] Fix linkage and license --- ports/liblas/portfile.cmake | 4 +++- ports/liblas/vcpkg.json | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ports/liblas/portfile.cmake b/ports/liblas/portfile.cmake index 3d2e5e1d977192..e7432afe28acdb 100644 --- a/ports/liblas/portfile.cmake +++ b/ports/liblas/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + set(VERSION 1.8.1) vcpkg_download_distfile(ARCHIVE @@ -33,7 +35,7 @@ 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) +if (NOT VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") endif() diff --git a/ports/liblas/vcpkg.json b/ports/liblas/vcpkg.json index 5d74aa79222d60..31fdc4d3372eba 100644 --- a/ports/liblas/vcpkg.json +++ b/ports/liblas/vcpkg.json @@ -3,8 +3,8 @@ "version": "1.8.1", "port-version": 10, "description": "A C/C++ library for reading and writing the very common LAS LiDAR format.", - "license": "BSD-3-Clause", - "supports": "!arm", + "license": null, + "supports": "!arm & !staticcrt", "dependencies": [ "boost-detail", "boost-filesystem", From 421bfe1e71909a74b5fd4910b423654291bb7dc3 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 8 Jul 2022 19:09:20 +0200 Subject: [PATCH 03/12] Drop pointless stuff --- ports/liblas/portfile.cmake | 7 ++----- ports/liblas/vcpkg.json | 10 ++-------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/ports/liblas/portfile.cmake b/ports/liblas/portfile.cmake index e7432afe28acdb..cb1c032f96b17e 100644 --- a/ports/liblas/portfile.cmake +++ b/ports/liblas/portfile.cmake @@ -16,17 +16,14 @@ vcpkg_extract_source_archive_ex( fix-boost-headers.patch ) -file(REMOVE "${SOURCE_PATH}/cmake/modules/FindPROJ4.cmake") -file(REMOVE "${SOURCE_PATH}/cmake/modules/FindGeoTIFF.cmake") +file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DBUILD_OSGEO4W=OFF # Disable osgeo4w + -DBUILD_OSGEO4W=OFF -DWITH_TESTS=OFF -DWITH_UTILITIES=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=${CMAKE_DISABLE_FIND_PACKAGE_ZLIB} - -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=${CMAKE_DISABLE_FIND_PACKAGE_JPEG} ) vcpkg_cmake_install() diff --git a/ports/liblas/vcpkg.json b/ports/liblas/vcpkg.json index 31fdc4d3372eba..62fd8efc252f26 100644 --- a/ports/liblas/vcpkg.json +++ b/ports/liblas/vcpkg.json @@ -28,16 +28,10 @@ ], "features": { "jpeg": { - "description": "Support for jpeg", - "dependencies": [ - "libjpeg-turbo" - ] + "description": "This feature does nothing. It is retained for compatibility." }, "zlib": { - "description": "Support zlib for compression", - "dependencies": [ - "zlib" - ] + "description": "This feature does nothing. It is retained for compatibility." } } } From 1d55420d2ee2e8695a78236e5531dae0396a3865 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 9 Jul 2022 08:54:54 +0200 Subject: [PATCH 04/12] Simplify cleanup, minor fixes --- ports/liblas/misc-fixes.patch | 59 +++++++++++++++++++++++++++++++++++ ports/liblas/portfile.cmake | 16 +++------- 2 files changed, 64 insertions(+), 11 deletions(-) create mode 100644 ports/liblas/misc-fixes.patch diff --git a/ports/liblas/misc-fixes.patch b/ports/liblas/misc-fixes.patch new file mode 100644 index 00000000000000..14f5ff6daca951 --- /dev/null +++ b/ports/liblas/misc-fixes.patch @@ -0,0 +1,59 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d246a88..3da2106 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,7 @@ + # + ############################################################################### + # libLAS general settings ++cmake_minimum_required(VERSION 3.7.0) + project(libLAS) + + +@@ -64,7 +65,6 @@ set(WITH_ENDIANAWARE FALSE CACHE BOOL "Choose whether or not libLAS should do ru + + ############################################################################### + # CMake settings +-cmake_minimum_required(VERSION 2.6.0) + + set(CMAKE_COLOR_MAKEFILE ON) + +@@ -107,7 +107,6 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIBLAS_BUILD_OUTPUT_DIRECTORY}) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBLAS_BUILD_OUTPUT_DIRECTORY}) + + file(READ "doc/index.txt" README ) +-file(WRITE "README.txt" "${README}") + + ############################################################################### + # Platform and compiler specific settings +@@ -138,8 +137,6 @@ if(WIN32) + + endif() + +- set(CMAKE_INCLUDE_PATH c:/osgeo4w64/include;$ENV{CMAKE_INCLUDE_PATH}) +- set(CMAKE_LIBRARY_PATH c:/osgeo4w64/lib;$ENV{CMAKE_LIBRARY_PATH}) + else() + + # Recommended C++ compilation flags +@@ -337,8 +334,6 @@ set(LIBLAS_DATA_DIR ${LIBLAS_DATA_SUBDIR}) + ############################################################################### + # Installation commands + +-install(FILES AUTHORS COPYING INSTALL LICENSE.txt README.txt +- DESTINATION ${LIBLAS_DATA_DIR}/doc) + + ############################################################################### + # Processing of project directories +diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt +index beb83e2..e328c95 100644 +--- a/apps/CMakeLists.txt ++++ b/apps/CMakeLists.txt +@@ -160,7 +160,7 @@ install(TARGETS ${LIBLAS_UTILITIES} + ARCHIVE DESTINATION ${LIBLAS_LIB_DIR}) + + +-if(UNIX) ++if(0) + + set(LIBLAS_UTILS_RPATH ${CMAKE_INSTALL_PREFIX}/lib ${Boost_LIBRARY_DIRS}) + if(LASZIP_FOUND) diff --git a/ports/liblas/portfile.cmake b/ports/liblas/portfile.cmake index cb1c032f96b17e..2735107abad6d2 100644 --- a/ports/liblas/portfile.cmake +++ b/ports/liblas/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH PATCHES fix-boost-headers.patch + misc-fixes.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules") @@ -28,22 +29,15 @@ vcpkg_cmake_configure( 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") - -if (NOT VCPKG_TARGET_IS_WINDOWS) - 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") - if (VCPKG_TARGET_IS_WINDOWS) vcpkg_cmake_config_fixup(CONFIG_PATH cmake) else() 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/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) From 3e64784b921b9b51ba1a9a99909fe95e07ef772d Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sun, 10 Jul 2022 10:25:37 +0200 Subject: [PATCH 05/12] Fix exported config --- ports/liblas/fix-cmake-config.patch | 13 +++++++++++++ ports/liblas/portfile.cmake | 1 + 2 files changed, 14 insertions(+) create mode 100644 ports/liblas/fix-cmake-config.patch diff --git a/ports/liblas/fix-cmake-config.patch b/ports/liblas/fix-cmake-config.patch new file mode 100644 index 00000000000000..53a819aeafbabd --- /dev/null +++ b/ports/liblas/fix-cmake-config.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/liblas-config.cmake.in b/cmake/liblas-config.cmake.in +index 175e997..8a55804 100644 +--- a/cmake/liblas-config.cmake.in ++++ b/cmake/liblas-config.cmake.in +@@ -19,6 +19,8 @@ set (libLAS_INCLUDE_DIRS "${PROJECT_ROOT_DIR}/include") + set (libLAS_LIBRARY_DIRS "${PROJECT_ROOT_DIR}/lib") + set (libLAS_BINARY_DIRS "${PROJECT_ROOT_DIR}/bin") + ++include(CMakeFindDependencyMacro) ++find_dependency(GeoTIFF CONFIG) + include ("${_DIR}/liblas-depends.cmake") + if(WIN32) + set (libLAS_LIBRARIES liblas liblas_c) diff --git a/ports/liblas/portfile.cmake b/ports/liblas/portfile.cmake index 2735107abad6d2..486e5aacb93e20 100644 --- a/ports/liblas/portfile.cmake +++ b/ports/liblas/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH PATCHES fix-boost-headers.patch + fix-cmake-config.patch misc-fixes.patch ) From b90474e7a02663c8a07fa7916566a819e9d54f42 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sun, 10 Jul 2022 11:25:42 +0200 Subject: [PATCH 06/12] Add tools feature --- ports/liblas/portfile.cmake | 17 ++++++++++++++++- ports/liblas/vcpkg.json | 3 +++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ports/liblas/portfile.cmake b/ports/liblas/portfile.cmake index 486e5aacb93e20..e16c994a36b636 100644 --- a/ports/liblas/portfile.cmake +++ b/ports/liblas/portfile.cmake @@ -20,11 +20,18 @@ vcpkg_extract_source_archive_ex( file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules") +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools WITH_UTILITIES +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS + OPTIONS + ${FEATURE_OPTIONS} -DBUILD_OSGEO4W=OFF -DWITH_TESTS=OFF + OPTIONS_DEBUG -DWITH_UTILITIES=OFF ) @@ -41,4 +48,12 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" ) +if(WITH_UTILITIES) + set(tools lasinfo lasblock las2las las2txt txt2las ts2las) + if(NOT WIN32) + list(APPEND tools las2col las2pg) + endif() + vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN) +endif() + 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 62fd8efc252f26..bfb042e370fab1 100644 --- a/ports/liblas/vcpkg.json +++ b/ports/liblas/vcpkg.json @@ -30,6 +30,9 @@ "jpeg": { "description": "This feature does nothing. It is retained for compatibility." }, + "tools": { + "description": "Build utilities." + }, "zlib": { "description": "This feature does nothing. It is retained for compatibility." } From e100a54c7d6dfdb01b730baeb9fd11c21d80cf6d Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sun, 10 Jul 2022 11:36:07 +0200 Subject: [PATCH 07/12] Install usage file --- ports/liblas/portfile.cmake | 1 + ports/liblas/usage | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 ports/liblas/usage diff --git a/ports/liblas/portfile.cmake b/ports/liblas/portfile.cmake index e16c994a36b636..30976cb89db4e2 100644 --- a/ports/liblas/portfile.cmake +++ b/ports/liblas/portfile.cmake @@ -56,4 +56,5 @@ if(WITH_UTILITIES) vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN) 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) diff --git a/ports/liblas/usage b/ports/liblas/usage new file mode 100644 index 00000000000000..eeda9505a73963 --- /dev/null +++ b/ports/liblas/usage @@ -0,0 +1,9 @@ +liblas provides CMake targets: + + # C API + find_package(liblas CONFIG REQUIRED) + target_link_libraries(main PRIVATE las_c) + + # C++ API + find_package(liblas CONFIG REQUIRED) + target_link_libraries(main PRIVATE las) From 7a9d0559f31e743b09aa993e80e38687f04f71d8 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sun, 10 Jul 2022 18:28:45 +0200 Subject: [PATCH 08/12] Update versions --- versions/l-/liblas.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/liblas.json b/versions/l-/liblas.json index bbb3eb8e0c8269..77387f1fc23b99 100644 --- a/versions/l-/liblas.json +++ b/versions/l-/liblas.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2298191e0c3e2866daf3b199bc8046c9a25f37fa", + "git-tree": "f7bbd244bd2b72cf3a7c8e68fc4effb62c705dc9", "version": "1.8.1", "port-version": 10 }, From 5bc4314cd891b57d2491f15a0a3a1ba7b986f320 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 11 Jul 2022 05:50:43 +0200 Subject: [PATCH 09/12] Fix usage --- ports/liblas/usage | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/liblas/usage b/ports/liblas/usage index eeda9505a73963..e95366c0bf7e0b 100644 --- a/ports/liblas/usage +++ b/ports/liblas/usage @@ -1,9 +1,9 @@ liblas provides CMake targets: # C API - find_package(liblas CONFIG REQUIRED) + find_package(libLAS CONFIG REQUIRED) target_link_libraries(main PRIVATE las_c) # C++ API - find_package(liblas CONFIG REQUIRED) + find_package(libLAS CONFIG REQUIRED) target_link_libraries(main PRIVATE las) From 55e68466ccff0229c5f0a777cad186025d31501f Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 11 Jul 2022 05:51:09 +0200 Subject: [PATCH 10/12] Update versions --- versions/l-/liblas.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/liblas.json b/versions/l-/liblas.json index 77387f1fc23b99..2c1bc542a44ddf 100644 --- a/versions/l-/liblas.json +++ b/versions/l-/liblas.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f7bbd244bd2b72cf3a7c8e68fc4effb62c705dc9", + "git-tree": "d797150b08e0c66589524c92dcada3d9c5bcf591", "version": "1.8.1", "port-version": 10 }, From 45d62a249acb26d1a56c678e2ded62dbd73b714a Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 11 Jul 2022 06:19:42 +0200 Subject: [PATCH 11/12] Add Windows prefix to usage --- ports/liblas/usage | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/liblas/usage b/ports/liblas/usage index e95366c0bf7e0b..87170054704a89 100644 --- a/ports/liblas/usage +++ b/ports/liblas/usage @@ -2,8 +2,8 @@ liblas provides CMake targets: # C API find_package(libLAS CONFIG REQUIRED) - target_link_libraries(main PRIVATE las_c) + target_link_libraries(main PRIVATE $<$:lib>las_c) # C++ API find_package(libLAS CONFIG REQUIRED) - target_link_libraries(main PRIVATE las) + target_link_libraries(main PRIVATE $<$:lib>las) From 5a2c2e8c42816d23d59257f842f2ba3d635eaf2e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 11 Jul 2022 06:19:53 +0200 Subject: [PATCH 12/12] Update versions --- versions/l-/liblas.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/liblas.json b/versions/l-/liblas.json index 2c1bc542a44ddf..8d32b3242fa80f 100644 --- a/versions/l-/liblas.json +++ b/versions/l-/liblas.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d797150b08e0c66589524c92dcada3d9c5bcf591", + "git-tree": "59d85ba2350ba688af5aad5a538382fd7b2963e3", "version": "1.8.1", "port-version": 10 },