From eaa2e3db0fa6162112fa76e87ac44a67db7225c8 Mon Sep 17 00:00:00 2001 From: Lily <47812810+LilyWangL@users.noreply.github.com> Date: Wed, 14 Oct 2020 05:38:05 +0800 Subject: [libgeotiff] Upgrade to version 1.6.0 (#10408) --- ports/liblas/fix-BuildError.patch | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 ports/liblas/fix-BuildError.patch (limited to 'ports/liblas/fix-BuildError.patch') diff --git a/ports/liblas/fix-BuildError.patch b/ports/liblas/fix-BuildError.patch deleted file mode 100644 index 4f9d768dc..000000000 --- a/ports/liblas/fix-BuildError.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt -index beb83e2..6f216bd 100644 ---- a/apps/CMakeLists.txt -+++ b/apps/CMakeLists.txt -@@ -155,7 +152,7 @@ endif() - # Targets installation - - install(TARGETS ${LIBLAS_UTILITIES} -- RUNTIME DESTINATION ${LIBLAS_BIN_DIR} -+ RUNTIME DESTINATION tools - LIBRARY DESTINATION ${LIBLAS_LIB_DIR} - ARCHIVE DESTINATION ${LIBLAS_LIB_DIR}) - -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index c7f583d..ca9e602 100644 ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -5,13 +5,8 @@ - # Set where cmake will install liblas-config.cmake. It's installed in - # ${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR} and ${PROJECT_ROOT_DIR} - # is the relative path to the root from there. --if (NOT WIN32) -- set(INSTALL_CMAKE_DIR "share/cmake/${PROJECT_NAME}") -- set (PROJECT_ROOT_DIR "../../..") --else () -- set(INSTALL_CMAKE_DIR "cmake") -- set (PROJECT_ROOT_DIR "..") --endif () -+set(INSTALL_CMAKE_DIR "share/cmake/${PROJECT_NAME}") -+set (PROJECT_ROOT_DIR "../../..") - - # Now create the liblas-config files using the .in templates - configure_file (liblas-config.cmake.in -- cgit v1.2.3