[liblas] fix cmake consumption (#29259)

* [liblas] fix consumption * v db
microsoft · Feb 1, 2023 · 6810f35 · 6810f35
1 parent acb4db3
commit 6810f35
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/ports/liblas/fix-cmake-config.patch b/ports/liblas/fix-cmake-config.patch
@@ -8,6 +8,7 @@ index 175e997..8a55804 100644
 
 +include(CMakeFindDependencyMacro)
 +find_dependency(GeoTIFF CONFIG)
- include ("${_DIR}/liblas-depends.cmake")
+-include ("${_DIR}/liblas-depends.cmake")
++include ("${CMAKE_CURRENT_LIST_DIR}/liblas-depends.cmake")
  if(WIN32)
    set (libLAS_LIBRARIES liblas liblas_c)
diff --git a/ports/liblas/portfile.cmake b/ports/liblas/portfile.cmake
@@ -43,6 +43,10 @@ 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" "/lib" "$<$<CONFIG:DEBUG>:/debug>/lib")
+vcpkg_replace_string ("${CURRENT_PACKAGES_DIR}/share/liblas/liblas-config.cmake" "/bin" "/tools/${PORT}")
+
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/include"
     "${CURRENT_PACKAGES_DIR}/debug/share"

diff --git a/ports/liblas/vcpkg.json b/ports/liblas/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "liblas",
   "version": "1.8.1",
-  "port-version": 10,
+  "port-version": 11,
   "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
@@ -3986,7 +3986,7 @@
     },
     "liblas": {
       "baseline": "1.8.1",
-      "port-version": 10
+      "port-version": 11
     },
     "liblbfgs": {
       "baseline": "1.10",

diff --git a/versions/l-/liblas.json b/versions/l-/liblas.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "aff83be201bcfe7db23231cf8ab667541294c4a6",
+      "version": "1.8.1",
+      "port-version": 11
+    },
     {
       "git-tree": "59d85ba2350ba688af5aad5a538382fd7b2963e3",
       "version": "1.8.1",