Skip to content

Commit

Permalink
[liblas]Fix ${_IMPORT_PREFIX} in liblas-depends-*.cmake. (#7920)
Browse files Browse the repository at this point in the history
* [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.
  • Loading branch information
JackBoosY authored and vicroms committed Oct 8, 2019
1 parent 7a33372 commit 0de501a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion ports/liblas/CONTROL
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
12 changes: 5 additions & 7 deletions ports/liblas/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)

0 comments on commit 0de501a

Please sign in to comment.