[lz4, flann] port patches from #5169 (#6294)

* [lz4, flann] port patches from #5169

* [lz4] use vcpkg_fixup_cmake_targets

* [flann] improve target handling

* [lz4] remove unnecessary debug message

* [openmvg] many many fixes to build it on windows

* [pcl] use official FLANN cmake config file instead of custom module

* [pcl] fix patch for flann targets

* [pcl] Bump CONTROL version

3 files changed, 75 insertions, 46 deletions

diff --git a/ports/lz4/CMakeLists.txt b/ports/lz4/CMakeLists.txt
index b082ab374..8f94cbeb6 100644
--- a/ports/lz4/CMakeLists.txt
+++ b/ports/lz4/CMakeLists.txt
@@ -6,21 +6,43 @@ if(BUILD_SHARED_LIBS)
 endif()
 add_definitions(-DXXH_NAMESPACE=LZ4_)
 
+set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "Install prefix")
+set(INSTALL_BIN_DIR      "bin"                       CACHE PATH "Path where exe and dll will be installed")
+set(INSTALL_LIB_DIR      "lib"                       CACHE PATH "Path where lib will be installed")
+set(INSTALL_INCLUDE_DIR  "include"                   CACHE PATH "Path where headers will be installed")
+set(INSTALL_CMAKE_DIR    "share/lz4"                 CACHE PATH "Path where cmake configs will be installed")
+
+file(GLOB LZ4_HEADERS lib/*.h)
+
 add_library(lz4
+    ${LZ4_HEADERS}
     lib/lz4.c
     lib/lz4frame.c
     lib/lz4hc.c
-    lib/xxhash.c)
+    lib/xxhash.c
+)
+
+target_include_directories(lz4 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/lib> $<INSTALL_INTERFACE:include>)
+set_target_properties(lz4 PROPERTIES PUBLIC_HEADER ${LZ4_HEADERS})
 
 install(TARGETS lz4
-    RUNTIME DESTINATION bin
-    ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION lib)
-
-if(NOT LZ4_SKIP_INCLUDES)
-    install(FILES
-        lib/lz4.h
-        lib/lz4frame.h
-        lib/lz4hc.h
-        DESTINATION include)
-endif()
+    EXPORT lz4Config
+    RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
+    ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
+    LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
+    PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}"
+    PRIVATE_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}"
+    COMPONENT dev
+)
+
+FILE(GLOB lz4h "${CMAKE_CURRENT_LIST_DIR}/lib/*.h")
+INSTALL(FILES ${lz4h} DESTINATION "${INSTALL_INCLUDE_DIR}")
+
+install(EXPORT lz4Config
+  FILE lz4Config.cmake
+  NAMESPACE lz4::
+  DESTINATION "${INSTALL_CMAKE_DIR}"
+)
+
+# Export the package for use from the build-tree (this registers the build-tree with a global CMake-registry)
+export(PACKAGE lz4)
diff --git a/ports/lz4/CONTROL b/ports/lz4/CONTROL
index c2db311f7..cdfb882ae 100644
--- a/ports/lz4/CONTROL
+++ b/ports/lz4/CONTROL
@@ -1,3 +1,3 @@
-Source: lz4

-Version: 1.9.1
-Description: Lossless compression algorithm, providing compression speed at 400 MB/s per core.

+Source: lz4
+Version: 1.9.1-1
+Description: Lossless compression algorithm, providing compression speed at 400 MB/s per core.
diff --git a/ports/lz4/portfile.cmake b/ports/lz4/portfile.cmake
index e839e3958..e7f1ee461 100644
--- a/ports/lz4/portfile.cmake
+++ b/ports/lz4/portfile.cmake
@@ -1,32 +1,39 @@
-include(vcpkg_common_functions)

-vcpkg_from_github(

-    OUT_SOURCE_PATH SOURCE_PATH

-    REPO lz4/lz4

+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO lz4/lz4
     REF v1.9.1
-    SHA512 536cdeb6dd73b4769cf9501ad312b004ab01699758534b47ca2eddbc815fd374a3caba40cde36f73a7a70e134065836b733e2b0c023c31740b877ef9317ccf3e

-    HEAD_REF dev)

-

-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})

-

-vcpkg_configure_cmake(

-    SOURCE_PATH ${SOURCE_PATH}

-    PREFER_NINJA

-    OPTIONS_DEBUG

-        -DLZ4_SKIP_INCLUDES=ON

-        -DCMAKE_DEBUG_POSTFIX=d)

-

-vcpkg_install_cmake()

-vcpkg_copy_pdbs()

-

-foreach(FILE lz4.h lz4frame.h)

-    file(READ ${CURRENT_PACKAGES_DIR}/include/${FILE} LZ4_HEADER)

-    if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")

-        string(REPLACE "defined(LZ4_DLL_IMPORT) && (LZ4_DLL_IMPORT==1)" "1" LZ4_HEADER "${LZ4_HEADER}")

-    else()

-        string(REPLACE "defined(LZ4_DLL_IMPORT) && (LZ4_DLL_IMPORT==1)" "0" LZ4_HEADER "${LZ4_HEADER}")

-    endif()

-    file(WRITE ${CURRENT_PACKAGES_DIR}/include/${FILE} "${LZ4_HEADER}")

-endforeach()

-

-file(COPY ${SOURCE_PATH}/lib/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/lz4)

-file(RENAME ${CURRENT_PACKAGES_DIR}/share/lz4/LICENSE ${CURRENT_PACKAGES_DIR}/share/lz4/copyright)

+    SHA512 536cdeb6dd73b4769cf9501ad312b004ab01699758534b47ca2eddbc815fd374a3caba40cde36f73a7a70e134065836b733e2b0c023c31740b877ef9317ccf3e
+    HEAD_REF dev
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS_DEBUG
+        -DCMAKE_DEBUG_POSTFIX=d
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+foreach(FILE lz4.h lz4frame.h)
+    file(READ ${CURRENT_PACKAGES_DIR}/include/${FILE} LZ4_HEADER)
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+        string(REPLACE "defined(LZ4_DLL_IMPORT) && (LZ4_DLL_IMPORT==1)" "1" LZ4_HEADER "${LZ4_HEADER}")
+    else()
+        string(REPLACE "defined(LZ4_DLL_IMPORT) && (LZ4_DLL_IMPORT==1)" "0" LZ4_HEADER "${LZ4_HEADER}")
+    endif()
+    file(WRITE ${CURRENT_PACKAGES_DIR}/include/${FILE} "${LZ4_HEADER}")
+endforeach()
+
+vcpkg_fixup_cmake_targets()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+file(COPY ${SOURCE_PATH}/lib/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/lz4)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/lz4/LICENSE ${CURRENT_PACKAGES_DIR}/share/lz4/copyright)
+