diff options
| -rw-r--r-- | ports/lastools/CONTROL | 2 | ||||
| -rw-r--r-- | ports/lastools/fix_install_paths_lastools.patch | 27 | ||||
| -rw-r--r-- | ports/lastools/portfile.cmake | 10 |
3 files changed, 33 insertions, 6 deletions
diff --git a/ports/lastools/CONTROL b/ports/lastools/CONTROL index 311130373..dbeb69fc8 100644 --- a/ports/lastools/CONTROL +++ b/ports/lastools/CONTROL @@ -1,5 +1,5 @@ Source: lastools
-Version: 2019-07-10
+Version: 2020-05-09
Homepage: https://github.com/LAStools/LAStools
Description: LAStools: award-winning software for efficient LiDAR processing (with LASzip)
Supports: !uwp
\ No newline at end of file diff --git a/ports/lastools/fix_install_paths_lastools.patch b/ports/lastools/fix_install_paths_lastools.patch new file mode 100644 index 000000000..10bb34070 --- /dev/null +++ b/ports/lastools/fix_install_paths_lastools.patch @@ -0,0 +1,27 @@ +diff --git a/LASlib/src/CMakeLists.txt b/LASlib/src/CMakeLists.txt
+index 1b170bf..b5c40cb 100644
+--- a/LASlib/src/CMakeLists.txt
++++ b/LASlib/src/CMakeLists.txt
+@@ -99,17 +99,8 @@ if(MSVC)
+ )
+ endif()
+
++install(TARGETS LASlib EXPORT LASlib-targets
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install(FILES ${LAS_INCLUDES} DESTINATION include/LASlib)
+-
+-if (MSVC)
+- foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} )
+- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../lib/${OUTPUTCONFIG} DESTINATION lib/LASlib)
+- endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES )
+-else()
+- install(TARGETS LASlib EXPORT laslib-targets
+- ARCHIVE DESTINATION lib/LASlib
+- LIBRARY DESTINATION lib/LASlib
+- RUNTIME DESTINATION lib/LASlib)
+- install(EXPORT laslib-targets DESTINATION lib/cmake/LASlib)
+- install(FILES ${CMAKE_SOURCE_DIR}/LASlib/src/laslib-config.cmake DESTINATION lib/cmake/LASlib)
+-endif(MSVC)
++install(EXPORT LASlib-targets DESTINATION share/lastools/LASlib)
++install(FILES ${CMAKE_SOURCE_DIR}/LASlib/src/laslib-config.cmake DESTINATION share/lastools/LASlib)
+\ No newline at end of file
diff --git a/ports/lastools/portfile.cmake b/ports/lastools/portfile.cmake index 5f6e40397..c3b4eb246 100644 --- a/ports/lastools/portfile.cmake +++ b/ports/lastools/portfile.cmake @@ -9,9 +9,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO LAStools/LAStools
- REF f15a702530e098b46c2eb3923f89a68ffa81e668
- SHA512 df5763b7c69721ba2a24fde2b4092e53136020b88ff4cc0d533279d709c55d7d16d8a4300f0b68829294d9311ed674af5b15306c4ded7a6310e55404737702e0
+ REF 7c444a4bbae16fe43c676824a26419bb740a6ab8
+ SHA512 4503b033a5319caee5570f25a05009c0d05a8c61a43ed78317899faaeba82fbc1f9a8c8433772bb36547c74e850a2e68d20a16f6f22b12b3004da7e1aa2f334b
HEAD_REF master
+ PATCHES
+ "fix_install_paths_lastools.patch"
)
vcpkg_configure_cmake(
@@ -22,12 +24,10 @@ vcpkg_configure_cmake( vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
|