[librdkafka] Update to 2019-05-07

5 files changed, 23 insertions, 98 deletions

diff --git a/ports/librdkafka/CONTROL b/ports/librdkafka/CONTROL
index 2612ead87..398856e9e 100644
--- a/ports/librdkafka/CONTROL
+++ b/ports/librdkafka/CONTROL
@@ -1,5 +1,5 @@
 Source: librdkafka

-Version: 2019-04-30

+Version: 2019-05-07

 Description: The Apache Kafka C/C++ library 

 Default-Features: ssl

 

diff --git a/ports/librdkafka/FindZstd.cmake b/ports/librdkafka/FindZstd.cmake
deleted file mode 100644
index 415f61324..000000000
--- a/ports/librdkafka/FindZstd.cmake
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# - Try to find Facebook zstd library
-# This will define
-# ZSTD_FOUND
-# ZSTD_INCLUDE_DIR
-# ZSTD_LIBRARY
-#
-
-find_path(ZSTD_INCLUDE_DIR NAMES zstd.h)
-
-find_library(ZSTD_LIBRARY_DEBUG NAMES zstdd zstd_staticd)
-find_library(ZSTD_LIBRARY_RELEASE NAMES zstd zstd_static)
-
-include(SelectLibraryConfigurations)
-SELECT_LIBRARY_CONFIGURATIONS(ZSTD)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(
-    ZSTD DEFAULT_MSG
-    ZSTD_LIBRARY ZSTD_INCLUDE_DIR
-)
-
-if (ZSTD_FOUND)
-    message(STATUS "Found Zstd: ${ZSTD_LIBRARY}")
-endif()
-
-mark_as_advanced(ZSTD_INCLUDE_DIR ZSTD_LIBRARY)
-
-
-# References:
-# https://github.com/facebook/folly/blob/master/CMake/FindZstd.cmake
diff --git a/ports/librdkafka/find_zstd.patch b/ports/librdkafka/find_zstd.patch
deleted file mode 100644
index 8d14a5b73..000000000
--- a/ports/librdkafka/find_zstd.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 76e92b70..38b7d5a9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -55,8 +55,8 @@ endif()
- # }
- 
- # ZSTD {
--find_library (ZSTD zstd)
--if(ZSTD)
-+find_package(Zstd)
-+if(ZSTD_FOUND)
-   set(with_zstd_default ON)
- else()
-   set(with_zstd_default OFF)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index aecb3917..52ba9fa4 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -169,8 +169,6 @@ if(WITH_ZLIB)
- endif()
- 
- if(WITH_ZSTD)
--  find_library (ZSTD_LIBRARY zstd)
--  find_path (ZSTD_INCLUDE_DIR NAMES zstd.h)
-   target_link_libraries(rdkafka PUBLIC ${ZSTD_LIBRARY})
-   target_include_directories(rdkafka PUBLIC ${ZSTD_INCLUDE_DIR})
-   message(STATUS "Found ZSTD: ${ZSTD_LIBRARY}")
diff --git a/ports/librdkafka/portfile.cmake b/ports/librdkafka/portfile.cmake
index 3acdbbf53..92d137b1f 100644
--- a/ports/librdkafka/portfile.cmake
+++ b/ports/librdkafka/portfile.cmake
@@ -3,43 +3,25 @@ include(vcpkg_common_functions)
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO edenhill/librdkafka

-    REF 9b3fce7b882b43302fb983d0e0e555225e672f92

-    SHA512 7edda198fb10a3a005fe4f47af55940051cdb7a350b8f06e7186e70ee9f3b44c7468134f42867303184a807a274507e4fa5b2f7997cd2fd5876993de04949140

+    REF 1f3203c8b647d865dffeb76c2af82ea34ca9b746

+    SHA512 7e0a48142acfa886daaeec98bc304f41de1270075215ccc90e5a8dcd2c11222179ed6c68a353dae55fe8a47f8080e15f05d2ac0a86fa74a2103119a286257cba

     HEAD_REF master

-    PATCHES

-        find_zstd.patch

 )

 

 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RDKAFKA_BUILD_STATIC)

 

-if("lz4" IN_LIST FEATURES)

-    set(ENABLE_LZ4_EXT ON)

-else()

-    set(ENABLE_LZ4_EXT OFF)

-endif()

-

-if("ssl" IN_LIST FEATURES)

-    set(WITH_SSL ON)

-else()

-    set(WITH_SSL OFF)

-endif()

+macro(check_feature _feature_name _var)

+    if("${_feature_name}" IN_LIST FEATURES)

+        set(${_var} ON)

+    else()

+        set(${_var} OFF)

+    endif()

+endmacro()

 

-if("zlib" IN_LIST FEATURES)

-    set(WITH_ZLIB ON)

-else()

-    set(WITH_ZLIB OFF)

-endif()

-

-if("zstd" IN_LIST FEATURES)

-    set(WITH_ZSTD ON)

-else()

-    set(WITH_ZSTD OFF)

-endif()

-

-file(COPY

-    ${CMAKE_CURRENT_LIST_DIR}/FindZstd.cmake

-    DESTINATION ${SOURCE_PATH}/packaging/cmake/Modules

-)

+check_feature(lz4 ENABLE_LZ4_EXT)

+check_feature(ssl WITH_SSL)

+check_feature(zlib WITH_ZLIB)

+check_feature(zstd WITH_ZSTD)

 

 vcpkg_configure_cmake(

     SOURCE_PATH ${SOURCE_PATH}

@@ -82,11 +64,6 @@ if(ENABLE_LZ4_EXT)
     )

 endif()

 

-file(COPY

-    ${CMAKE_CURRENT_LIST_DIR}/FindZstd.cmake

-    DESTINATION ${CURRENT_PACKAGES_DIR}/share/rdkafka

-)

-

 file(REMOVE_RECURSE

     ${CURRENT_PACKAGES_DIR}/debug/include

     ${CURRENT_PACKAGES_DIR}/debug/share

@@ -103,7 +80,10 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
 endif()

 

 # Handle copyright

-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)

+configure_file(${SOURCE_PATH}/LICENSES.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)

+

+# Install usage

+configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY)

 

 # CMake integration test

-#vcpkg_test_cmake(PACKAGE_NAME ${PORT})

+vcpkg_test_cmake(PACKAGE_NAME RdKafka)

diff --git a/ports/librdkafka/usage b/ports/librdkafka/usage
new file mode 100644
index 000000000..4f00a6a73
--- /dev/null
+++ b/ports/librdkafka/usage
@@ -0,0 +1,4 @@
+The package @PORT@:@TARGET_TRIPLET@ provides CMake targets:

+

+    find_package(RdKafka CONFIG REQUIRED)

+    target_link_libraries(main PRIVATE RdKafka::rdkafka RdKafka::rdkafka++)