diff options
| author | JackBoosY <47264268+JackBoosY@users.noreply.github.com> | 2019-10-09 02:33:55 +0800 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-10-08 11:33:55 -0700 |
| commit | 0de501a3f460f0f27c266b6e77ca22a6e3e597c8 (patch) | |
| tree | 857045c61f76e772166085b22e5febddcd6380c8 | |
| parent | 7a33372afdb6e9fe960551780b7ccb81c52a1d65 (diff) | |
| download | vcpkg-0de501a3f460f0f27c266b6e77ca22a6e3e597c8.tar.gz vcpkg-0de501a3f460f0f27c266b6e77ca22a6e3e597c8.zip | |
[liblas]Fix ${_IMPORT_PREFIX} in liblas-depends-*.cmake. (#7920)
* [liblas]Fix ${_IMPORT_PREFIX} in liblas-depends-debug.cmake/liblas-depends-release.cmake.
* [liblas]Fix depends.cmake.
* [liblas]Use vcpkg_fixup_cmake_targets to handle liblas-depends-*.cmake.
| -rw-r--r-- | ports/liblas/CONTROL | 2 | ||||
| -rw-r--r-- | ports/liblas/portfile.cmake | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/ports/liblas/CONTROL b/ports/liblas/CONTROL index 9752f4e96..a08401448 100644 --- a/ports/liblas/CONTROL +++ b/ports/liblas/CONTROL @@ -1,5 +1,5 @@ Source: liblas -Version: 1.8.1-2 +Version: 1.8.1-3 Build-Depends: boost, boost-thread, boost-system, boost-iostreams, boost-filesystem, libgeotiff Description: A C/C++ library for reading and writing the very common LAS LiDAR format. diff --git a/ports/liblas/portfile.cmake b/ports/liblas/portfile.cmake index 9b7b90dd7..e8697f589 100644 --- a/ports/liblas/portfile.cmake +++ b/ports/liblas/portfile.cmake @@ -36,15 +36,13 @@ 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(EXISTS ${CURRENT_PACKAGES_DIR}/debug/share/cmake/liblas) - vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/liblas) -endif() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/libLAS) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblas RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) |